Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/app/RootLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
selectAppNotifications,
selectIdentifiers,
selectUnreadAppNotifications,
selectUnreadW3CVcGrantNotifications,
} from '../state/selectors';

/**
Expand Down Expand Up @@ -61,6 +62,7 @@ const RootLayoutContent = () => {
const multisigRequests = useAppSelector(
selectActionableMultisigRequestNotifications
);
const w3cVcGrants = useAppSelector(selectUnreadW3CVcGrantNotifications);
const identifiers = useAppSelector(selectIdentifiers);
const connectDialogOpen = connectOpen && connection.status !== 'connected';
const pending = derivePendingState({
Expand All @@ -84,13 +86,15 @@ const RootLayoutContent = () => {
recentNotifications={appNotifications}
challengeRequests={challengeRequests}
credentialGrants={credentialGrants}
w3cVcGrants={w3cVcGrants}
delegationRequests={delegationRequests}
multisigRequests={multisigRequests}
identifiers={identifiers}
unreadNotificationCount={
unreadAppNotifications.length +
challengeRequests.length +
credentialGrants.length +
w3cVcGrants.length +
delegationRequests.length +
multisigRequests.length
}
Expand Down
28 changes: 27 additions & 1 deletion src/app/TopBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ import type {
DelegationRequestNotification,
MultisigRequestNotification,
} from '../state/notifications.slice';
import type { CredentialGrantNotification } from '../domain/credentials/credentialTypes';
import type {
CredentialGrantNotification,
W3CVcGrantNotification,
} from '../domain/credentials/credentialTypes';
import type { OperationRecord } from '../state/operations.slice';
import type { IdentifierSummary } from '../domain/identifiers/identifierTypes';
import { allAppNotificationsRead } from '../state/appNotifications.slice';
Expand Down Expand Up @@ -58,6 +61,8 @@ export interface TopBarProps {
challengeRequests: readonly ChallengeRequestNotification[];
/** Actionable credential grants discovered from KERIA notifications. */
credentialGrants: readonly CredentialGrantNotification[];
/** Informational W3C VC-JWT grants discovered from KERIA notifications. */
w3cVcGrants: readonly W3CVcGrantNotification[];
/** Actionable delegation requests discovered from KERIA notifications. */
delegationRequests: readonly DelegationRequestNotification[];
/** Actionable multisig requests discovered from KERIA notifications. */
Expand Down Expand Up @@ -85,6 +90,7 @@ export const TopBar = ({
recentNotifications,
challengeRequests,
credentialGrants,
w3cVcGrants,
delegationRequests,
multisigRequests,
identifiers,
Expand Down Expand Up @@ -117,6 +123,7 @@ export const TopBar = ({
[recentNotifications]
);
const credentialFetcher = useFetcher<CredentialActionData>();
const markReadFetcher = useFetcher<ContactActionData>();
const delegationFetcher = useFetcher<ContactActionData>();
const multisigFetcher = useFetcher<MultisigActionData>();
const visibleChallengeRequests = useMemo(
Expand All @@ -127,6 +134,10 @@ export const TopBar = ({
() => credentialGrants.slice(0, 3),
[credentialGrants]
);
const visibleW3CVcGrants = useMemo(
() => w3cVcGrants.slice(0, 3),
[w3cVcGrants]
);
const visibleDelegationRequests = useMemo(
() => delegationRequests.slice(0, 3),
[delegationRequests]
Expand Down Expand Up @@ -273,6 +284,18 @@ export const TopBar = ({
closeNotifications();
};

const markW3CGrantRead = (grant: W3CVcGrantNotification) => {
const formData = new FormData();
formData.set('intent', 'markNotificationRead');
formData.set('requestId', globalThis.crypto.randomUUID());
formData.set('notificationId', grant.notificationId);
markReadFetcher.submit(formData, {
method: 'post',
action: '/notifications',
});
closeNotifications();
};

const submitMultisigRequest = (
request: MultisigRequestNotification,
groupAlias: string,
Expand Down Expand Up @@ -326,6 +349,7 @@ export const TopBar = ({
visibleNotifications={visibleNotifications}
visibleChallengeRequests={visibleChallengeRequests}
visibleCredentialGrants={visibleCredentialGrants}
visibleW3CVcGrants={visibleW3CVcGrants}
visibleDelegationRequests={visibleDelegationRequests}
visibleMultisigRequests={visibleMultisigRequests}
identifiers={identifiers}
Expand All @@ -334,10 +358,12 @@ export const TopBar = ({
multisigLocalMemberOptions={multisigLocalMemberOptions}
canDismissChallengeRequests={dismissFetcher.state === 'idle'}
canSubmitCredentialGrants={credentialFetcher.state === 'idle'}
canMarkW3CGrantsRead={markReadFetcher.state === 'idle'}
canSubmitDelegationRequests={delegationFetcher.state === 'idle'}
canSubmitMultisigRequests={multisigFetcher.state === 'idle'}
dismissChallengeRequest={dismissChallengeRequest}
admitCredentialGrant={admitCredentialGrant}
markW3CGrantRead={markW3CGrantRead}
approveDelegationRequest={approveDelegationRequest}
submitMultisigRequest={submitMultisigRequest}
onClose={closeNotifications}
Expand Down
Loading
Loading