Merge branch 'main' of https://github.com/dappforce/grillchat into de…

…ploy/dh-staging
dappforce · Oct 27, 2023 · d9c1bef · d9c1bef
2 parents aefd3a3 + 6bdca41
commit d9c1bef
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/src/components/auth/ProfileModal/contents/notifications/PushNotificationContent.tsx b/src/components/auth/ProfileModal/contents/notifications/PushNotificationContent.tsx
@@ -1,4 +1,5 @@
 import Button from '@/components/Button'
+import LinkText from '@/components/LinkText'
 import Notice from '@/components/Notice'
 import Toast from '@/components/Toast'
 import { useLinkFcm } from '@/services/api/notifications/mutation'
@@ -87,7 +88,16 @@ async function getMessageTokenWithCatch() {
           title='Failed to enable push notification'
           subtitle='Notification permission was not granted.'
           t={t}
-          description='If you have blocked the notification permission, please go to your browser settings or go to "chrome://settings/content/notifications" and allow it.'
+          description={
+            <span>
+              If you have blocked the notification permission, please go to your
+              browser settings or go to{' '}
+              <LinkText href='chrome://settings/content/notifications'>
+                chrome://settings/content/notifications
+              </LinkText>{' '}
+              and allow it.
+            </span>
+          }
         />
       ))
       return

diff --git a/src/components/chats/StayUpdatedModal.tsx b/src/components/chats/StayUpdatedModal.tsx
@@ -35,7 +35,8 @@ export default function StayUpdatedModal({ ...props }: StayUpdatedModalProps) {
         }}
         title='🔔 Stay Updated'
         description='Enable Grill.chat notifications to stay engaged. You can disable them at any time.'
-        contentClassName={cx('!px-0')}
+        panelClassName={cx('rounded-b-xl')}
+        contentClassName={cx('!px-0 !pb-3')}
         titleClassName={cx('px-6')}
         descriptionClassName={cx('px-6')}
         withCloseButton

diff --git a/src/components/extensions/donate/api/utils.tsx b/src/components/extensions/donate/api/utils.tsx
@@ -95,7 +95,7 @@ export const openMobileWallet = async ({ connector }: OpenWalletProps) => {
   if (getUri) {
     const mobileUri = await getUri()
 
-    if (mobileUri.startsWith('http')) {
+    if (mobileUri && mobileUri.startsWith('http')) {
       const link = document.createElement('a')
       link.href = mobileUri
       link.target = '_blank'

diff --git a/src/modules/chat/HubPage/HubPage.tsx b/src/modules/chat/HubPage/HubPage.tsx
@@ -124,7 +124,7 @@ function CommunityHubToolbar({
           'flex items-center justify-between border-b border-border-gray py-2'
         )}
       >
-        <div className='flex items-center gap-2'>
+        <div className='flex items-center gap-2 text-sm'>
           <span className='text-text-muted'>Sort by:</span>
           <FloatingMenus
             menus={[
@@ -169,10 +169,10 @@ function CommunityHubToolbar({
           </FloatingMenus>
         </div>
         <Button
-          size='sm'
+          size='xs'
           variant='primary'
           className={cx(
-            'flex items-center gap-2',
+            'flex items-center gap-2 text-sm',
             !isLoggedIn && 'pointer-events-none select-none opacity-0'
           )}
           onClick={() => {

diff --git a/src/stores/my-account.ts b/src/stores/my-account.ts
@@ -119,12 +119,10 @@ export const useMyAccount = create<State & Actions>()((set, get) => ({
             cohortDate: dayjs().toDate(),
           }
         )
-      } else {
-        if (secretKey.startsWith('0x')) {
-          const augmented = secretKey.substring(2)
-          if (isSecretKeyUsingMiniSecret(augmented)) {
-            secretKey = augmented
-          }
+      } else if (secretKey.startsWith('0x')) {
+        const augmented = secretKey.substring(2)
+        if (isSecretKeyUsingMiniSecret(augmented)) {
+          secretKey = augmented
         }
       }