Merge branch 'staging' of https://github.com/OpenQDev/OpenQ-Frontend …

…into staging
OpenQDev · Mar 20, 2023 · f0ac025 · f0ac025
2 parents 0993e6c + fafd369
commit f0ac025
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/components/Layout/Navigation.js b/components/Layout/Navigation.js
@@ -26,8 +26,11 @@ const Navigation = () => {
 
   useEffect(() => {
     const getNotificationCookie = async () => {
-      const signedKnockTokenCookie = await window?.cookieStore?.get('signed_knock_token');
-      setNotificationToken(signedKnockTokenCookie?.value);
+      // regex for signed_knock_token cookie
+      const signedKnockTokenCookie = document.cookie.match(/(signed_knock_token=)(.*?)+/)[0].slice(19);
+
+      console.log(signedKnockTokenCookie);
+      setNotificationToken(signedKnockTokenCookie);
     };
 
     getNotificationCookie();

diff --git a/components/Notifications/NotificationBell.js b/components/Notifications/NotificationBell.js
@@ -15,6 +15,7 @@ const NotificationBell = ({ userId, notificationToken }) => {
 
   return (
     <KnockFeedProvider
+      colorMode='dark'
       apiKey={process.env.NEXT_PUBLIC_NOTIFICATIONS_PUBLIC_KEY}
       feedId={process.env.NEXT_PUBLIC_NOTIFICATIONS_CHANNEL_ID}
       userToken={notificationToken}
@@ -24,6 +25,7 @@ const NotificationBell = ({ userId, notificationToken }) => {
         <NotificationIconButton ref={notifButtonRef} onClick={() => setIsVisible(!isVisible)} />
         <NotificationFeedPopover
           buttonRef={notifButtonRef}
+          className='bg-red-500'
           isVisible={isVisible}
           onNotificationClick={(item) => notificationClicked(item)}
           onClose={() => setIsVisible(false)}

diff --git a/pages/batch.js b/pages/batch.js
@@ -84,8 +84,8 @@ function Batch() {
         } = transactionData;
 
         try {
-          const { decimals } = await appState.tokenClient.getToken(payoutTokenAddress);
-					console.log('decimals', decimals)
+          const { decimals } = await appState.tokenClient.getToken(ethers.utils.getAddress(payoutTokenAddress));
+          console.log('decimals', decimals);
 
           const newPayoutSchedule = convertPayoutScheduleToBigInt(payoutSchedule, decimals);