Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ui): Save notifications until dismissed #945

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(ui): Save notifications until dismissed #945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/locales/en/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1154,6 +1154,7 @@
"tab": {
"header": "Notifications",
"empty": "No notifications",
"complete": "Completed",
"chips": {
"all": "All",
"identifiers": "Identifiers",
Expand Down Expand Up @@ -1192,6 +1193,11 @@
"exnipexapply": "<strong>{{connection}}</strong> has requested a credential from you",
"exnipexgrantrevoke": "Your <strong>{{credential}}</strong> credential has been revoked",
"exnipexapplyproposed": "<strong>{{initiator}}</strong> has proposed a credential for the <strong>{{connection}}’s</strong> request"
},
"button": {
"read": "Read",
"unread": "Unread",
"delete": "Delete"
}
},
"details": {
Expand Down
2 changes: 2 additions & 0 deletions src/ui/pages/Notifications/Notification.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ interface NotificationItemProps {
item: KeriaNotification;
onClick: (item: KeriaNotification) => void;
onOptionButtonClick: (item: KeriaNotification) => void;
onDelete: (item: KeriaNotification) => void;
onReadToggle: (item: KeriaNotification) => void;
}

export { NotificationFilters };
Expand Down
121 changes: 87 additions & 34 deletions src/ui/pages/Notifications/NotificationItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import { IonIcon, IonItem, IonLabel } from "@ionic/react";
import { IonIcon, IonItem, IonItemOption, IonItemOptions, IonItemSliding, IonLabel } from "@ionic/react";
import { t } from "i18next";
import {
ellipsisHorizontal,
fingerPrintOutline,
idCardOutline,
mailOpenOutline,
mailUnreadOutline,
trashOutline
} from "ionicons/icons";
import { MouseEvent, useMemo } from "react";
import { Trans } from "react-i18next";
Expand All @@ -19,14 +22,19 @@ import {
import KeriLogo from "../../assets/images/KeriGeneric.jpg";
import { timeDifference } from "../../utils/formatters";
import { NotificationItemProps } from "./Notification.types";
import { combineClassNames } from "../../utils/style";

const NotificationItem = ({
item,
onClick,
onOptionButtonClick,
onDelete,
onReadToggle
}: NotificationItemProps) => {
const connectionsCache = useAppSelector(getConnectionsCache);
const multisigConnectionsCache = useAppSelector(getMultisigConnectionsCache);

const isComplete = false;

const notificationLabelText = useMemo(() => {
const connectionName = connectionsCache?.[item.connectionId]?.label;
Expand Down Expand Up @@ -84,42 +92,87 @@ const NotificationItem = ({
onOptionButtonClick(item);
};

const deleteNotification = () => {
onDelete(item);
};

const itemClasses = combineClassNames("notifications-tab-item", {
unread: !item.read,
complete: isComplete
})

const onClickItem = () => {
onClick(item);
}

return (
<IonItem
onClick={() => onClick(item)}
className={`notifications-tab-item${item.read ? "" : " unread"}`}
data-testid={`notifications-tab-item-${item.id}`}
>
<div className="notification-logo">
<img
src={KeriLogo}
alt="notifications-tab-item-logo"
className="notifications-tab-item-logo"
data-testid="notifications-tab-item-logo"
/>
<IonItemSliding className="notification-tab-item-slide">
<IonItem
onClick={onClickItem}
className={itemClasses}
data-testid={`notifications-tab-item-${item.id}`}
>
<div className="notification-logo">
<img
src={KeriLogo}
alt="notifications-tab-item-logo"
className="notifications-tab-item-logo"
data-testid="notifications-tab-item-logo"
/>
<IonIcon
src={referIcon(item)}
size="small"
className="notification-ref-icon"
/>
</div>
<IonLabel>
<Trans>{notificationLabelText}</Trans>
<br />
<span className="notifications-tab-item-time">
{timeDifference(item.createdAt)[0]}
{timeDifference(item.createdAt)[1]}
</span>
{
isComplete && <span className="complete"> • <span className="complete-label">{t("tabs.notifications.tab.complete")}</span></span>
}
</IonLabel>
<IonIcon
src={referIcon(item)}
size="small"
className="notification-ref-icon"
aria-hidden="true"
icon={ellipsisHorizontal}
slot="end"
className="notifications-tab-item-ellipsis"
data-testid={`${item.id}-option-btn`}
onClick={openOptionModal}
/>
</div>
<IonLabel>
<Trans>{notificationLabelText}</Trans>
<br />
<span className="notifications-tab-item-time">
{timeDifference(item.createdAt)[0]}
{timeDifference(item.createdAt)[1]}
</span>
</IonLabel>
<IonIcon
aria-hidden="true"
icon={ellipsisHorizontal}
slot="end"
className="notifications-tab-item-ellipsis"
data-testid={`${item.id}-option-btn`}
onClick={openOptionModal}
/>
</IonItem>
</IonItem>
<IonItemOptions onIonSwipe={deleteNotification}>
{!isComplete && (
<IonItemOption
className="read-button"
onClick={() => {
onReadToggle(item)
}}
data-testid={`toogle-read-button-${item.id}`}
>
<div className="option-content">
<IonIcon icon={item.read ? mailOpenOutline : mailUnreadOutline}/>
<span>{item.read ? t("tabs.notifications.tab.button.unread") : t("tabs.notifications.tab.button.read")}</span>
</div>
</IonItemOption>
)}
<IonItemOption
color="danger"
onClick={deleteNotification}
data-testid={`delete-button-${item.id}`}
expandable
>
<div className="option-content">
<IonIcon icon={trashOutline}/>
<span>{t("tabs.notifications.tab.button.delete")}</span>
</div>
</IonItemOption>
</IonItemOptions>
</IonItemSliding>
);
};

Expand Down
45 changes: 44 additions & 1 deletion src/ui/pages/Notifications/Notifications.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,54 @@
background: transparent;
}

.notification-tab-item-slide {
.option-content {
display: flex;
flex-direction: column;
align-items: center;
min-width: 3.5rem;

ion-icon {
margin-bottom: 0.5rem;
}
}

.complete {
color: var(--ion-color-neutral-500);
font-size: 0.625rem;
}

.complete-label {
text-transform: uppercase;
font-weight: 500;
color: var(--ion-color-success-800);
font-size: 0.625rem;
}

@media screen and (min-width: 250px) and (max-width: 370px) {
.option-content {
min-width: 3rem;

span {
font-size: 13px;
}

ion-icon {
margin-bottom: 0.5rem;
}
}
}

.notifications-tab-item.complete {
background: var(--ion-color-neutral-300);
}
}

.notifications-tab-item {
height: 4.5rem;
display: flex;
justify-content: space-between;
background: transparent;
background: var(--ion-color-neutral-200);

&.unread {
background: var(--ion-color-primary-200);
Expand Down
Loading
Loading