Merge 0637f12 into 35c9c76

src/components/AppLayout/Header/components/Layout.tsx

@@ -20,6 +20,7 @@ import { shouldSwitchWalletChain } from 'src/logic/wallets/store/selectors'
 import { useSelector } from 'react-redux'
 import { OVERVIEW_EVENTS } from 'src/utils/events/overview'
 import Track from 'src/components/Track'
+import Notifications from 'src/components/AppLayout/Header/components/Notifications'
 
 const styles = () => ({
   root: {
@@ -90,7 +91,8 @@ const WalletPopup = ({ anchorEl, providerDetails, classes, open, onClose }) => {
 }
 
 const Layout = ({ classes, providerDetails, providerInfo }) => {
-  const { clickAway, open, toggle } = useStateHandler()
+  const { clickAway: clickAwayNotifications, open: openNotifications, toggle: toggleNotifications } = useStateHandler()
+  const { clickAway: clickAwayWallet, open: openWallet, toggle: toggleWallet } = useStateHandler()
   const { clickAway: clickAwayNetworks, open: openNetworks, toggle: toggleNetworks } = useStateHandler()
   const isWrongChain = useSelector(shouldSwitchWalletChain)
 
@@ -113,25 +115,28 @@ const Layout = ({ classes, providerDetails, providerInfo }) => {
         </div>
       )}
 
+      <Divider />
+      <Notifications open={openNotifications} toggle={toggleNotifications} clickAway={clickAwayNotifications} />
+
       <Divider />
       <Provider
         info={providerInfo}
-        open={open}
-        toggle={toggle}
+        open={openWallet}
+        toggle={toggleWallet}
         render={(providerRef) =>
           providerRef.current && (
             <WalletPopup
               anchorEl={providerRef.current}
               providerDetails={providerDetails}
-              open={open}
+              open={openWallet}
               classes={classes}
-              onClose={clickAway}
+              onClose={clickAwayWallet}
             />
           )
         }
       />
-      <Divider />
 
+      <Divider />
       <NetworkSelector open={openNetworks} toggle={toggleNetworks} clickAway={clickAwayNetworks} />
     </Row>
   )

src/components/AppLayout/Header/components/Notifications/NotificationItem.tsx

@@ -0,0 +1,61 @@
+import { ReactElement } from 'react'
+import styled from 'styled-components'
+import { OptionsObject } from 'notistack'
+
+import { NotificationsState } from 'src/logic/notifications/store/notifications'
+import { black500 } from 'src/theme/variables'
+import { formatTime } from 'src/utils/date'
+import AlertIcon from 'src/assets/icons/alert.svg'
+import CheckIcon from 'src/assets/icons/check.svg'
+import ErrorIcon from 'src/assets/icons/error.svg'
+import InfoIcon from 'src/assets/icons/info.svg'
+import { UnreadNotificationBadge, NotificationSubtitle } from 'src/components/AppLayout/Header/components/Notifications'
+
+const notificationIcon = {
+  error: ErrorIcon,
+  info: InfoIcon,
+  success: CheckIcon,
+  warning: AlertIcon,
+}
+
+const getNotificationIcon = (variant: OptionsObject['variant'] = 'info'): string => notificationIcon[variant]
+
+const NoficationItem = ({ read, options, message, timestamp }: NotificationsState[number]): ReactElement => (
+  <Notification>
+    <UnreadNotificationBadge
+      variant="dot"
+      overlap="circle"
+      invisible={read}
+      anchorOrigin={{
+        vertical: 'top',
+        horizontal: 'left',
+      }}
+    >
+      <img src={getNotificationIcon(options?.variant)} />
+    </UnreadNotificationBadge>
+    <div>
+      <NotificationMessage>{message}</NotificationMessage>
+      <br />
+      <NotificationSubtitle>{formatTime(timestamp)}</NotificationSubtitle>
+    </div>
+  </Notification>
+)
+
+const Notification = styled.div`
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  > * {
+    padding: 8px;
+  }
+`
+
+const NotificationMessage = styled.p`
+  all: unset;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 24px;
+  color: ${black500};
+`
+
+export default NoficationItem

src/components/AppLayout/Header/components/Notifications/NotificationList.tsx

@@ -0,0 +1,41 @@
+import { ReactElement } from 'react'
+import styled from 'styled-components'
+
+import { NotificationsState } from 'src/logic/notifications/store/notifications'
+import { NOTIFICATION_LIMIT } from 'src/components/AppLayout/Header/components/Notifications'
+import { StyledScrollableBar } from 'src/routes/safe/components/Transactions/TxList/styled'
+import { black300 } from 'src/theme/variables'
+import NotificationItem from 'src/components/AppLayout/Header/components/Notifications/NotificationItem'
+
+const NotificationList = ({ notifications }: { notifications: NotificationsState }): ReactElement => {
+  if (!notifications.length) {
+    return <NotificationType>No notifications</NotificationType>
+  }
+
+  return (
+    <ScrollContainer $showScrollbar={notifications.length > NOTIFICATION_LIMIT}>
+      <NotificationType>System updates</NotificationType>
+      {notifications.map((notification) => (
+        <NotificationItem key={notification.timestamp} {...notification} />
+      ))}
+    </ScrollContainer>
+  )
+}
+
+const ScrollContainer = styled(StyledScrollableBar)<{ $showScrollbar: boolean }>`
+  height: ${({ $showScrollbar: $scroll }) => ($scroll ? '500px' : 'auto')};
+  overflow-x: hidden;
+  overflow-y: auto;
+  width: 100%;
+`
+
+const NotificationType = styled.h4`
+  all: unset;
+  display: block;
+  font-weight: 400;
+  font-size: 14px;
+  color: ${black300};
+  margin-bottom: 12px;
+`
+
+export default NotificationList

src/components/AppLayout/Header/components/Notifications/__tests__/index.test.ts

@@ -0,0 +1,103 @@
+import { NotificationsState } from 'src/logic/notifications/store/notifications'
+import { getSortedNotifications } from '../'
+
+const UNREAD_ACTION_NOTIFICATION = {
+  read: false,
+  action: true,
+} as NotificationsState[number]
+
+const UNREAD_NOTIFICATION = {
+  read: false,
+  action: false,
+} as NotificationsState[number]
+
+const READ_ACTION_NOTIFICATION = {
+  read: true,
+  action: true,
+} as NotificationsState[number]
+
+const READ_NOTIFICATION = {
+  read: true,
+  action: false,
+} as NotificationsState[number]
+
+describe('Notifications', () => {
+  describe('getSortedNotifications', () => {
+    it("should't sort correctly ordered notifications", () => {
+      const notifications = [
+        { ...UNREAD_ACTION_NOTIFICATION, timestamp: 6 },
+        { ...UNREAD_ACTION_NOTIFICATION, timestamp: 5 },
+        { ...UNREAD_NOTIFICATION, timestamp: 4 },
+        { ...UNREAD_NOTIFICATION, timestamp: 3 },
+        { ...READ_ACTION_NOTIFICATION, timestamp: 2 },
+        { ...READ_NOTIFICATION, timestamp: 1 },
+      ]
+      expect(getSortedNotifications(notifications)).toEqual(notifications)
+    })
+
+    it('should sort the read notifications chronologically regardless of action', () => {
+      const notifications = [
+        { ...READ_NOTIFICATION, timestamp: 1 },
+        { ...READ_NOTIFICATION, timestamp: 2 },
+        { ...READ_ACTION_NOTIFICATION, timestamp: 3 },
+        { ...READ_NOTIFICATION, timestamp: 4 },
+      ]
+
+      const sortedNotifications = [
+        { ...READ_NOTIFICATION, timestamp: 4 },
+        { ...READ_ACTION_NOTIFICATION, timestamp: 3 },
+        { ...READ_NOTIFICATION, timestamp: 2 },
+        { ...READ_NOTIFICATION, timestamp: 1 },
+      ]
+
+      expect(getSortedNotifications(notifications)).toEqual(sortedNotifications)
+    })
+
+    it('should sort unread actionable notifications to the top', () => {
+      const notifications = [
+        { ...READ_ACTION_NOTIFICATION, timestamp: 3 },
+        { ...READ_NOTIFICATION, timestamp: 2 },
+        { ...UNREAD_ACTION_NOTIFICATION, timestamp: 1 },
+      ]
+
+      const sortedNotifications = [
+        { ...UNREAD_ACTION_NOTIFICATION, timestamp: 1 },
+        { ...READ_ACTION_NOTIFICATION, timestamp: 3 },
+        { ...READ_NOTIFICATION, timestamp: 2 },
+      ]
+      expect(getSortedNotifications(notifications)).toEqual(sortedNotifications)
+    })
+    it('should sort unread notifications to the top', () => {
+      const notifications = [
+        { ...READ_ACTION_NOTIFICATION, timestamp: 3 },
+        { ...READ_NOTIFICATION, timestamp: 3 },
+        { ...UNREAD_NOTIFICATION, timestamp: 1 },
+      ]
+
+      const sortedNotifications = [
+        { ...UNREAD_NOTIFICATION, timestamp: 1 },
+        { ...READ_ACTION_NOTIFICATION, timestamp: 3 },
+        { ...READ_NOTIFICATION, timestamp: 3 },
+      ]
+
+      expect(getSortedNotifications(notifications)).toEqual(sortedNotifications)
+    })
+    it('should sort actionable notifications to the top, followed by unread notifications', () => {
+      const notifications = [
+        { ...READ_ACTION_NOTIFICATION, timestamp: 4 },
+        { ...READ_NOTIFICATION, timestamp: 3 },
+        { ...UNREAD_NOTIFICATION, timestamp: 2 },
+        { ...UNREAD_ACTION_NOTIFICATION, timestamp: 1 },
+      ]
+
+      const sortedNotifications = [
+        { ...UNREAD_ACTION_NOTIFICATION, timestamp: 1 },
+        { ...UNREAD_NOTIFICATION, timestamp: 2 },
+        { ...READ_ACTION_NOTIFICATION, timestamp: 4 },
+        { ...READ_NOTIFICATION, timestamp: 3 },
+      ]
+
+      expect(getSortedNotifications(notifications)).toEqual(sortedNotifications)
+    })
+  })
+})