Merge pull request #360 from dappforce/deploy/send

Fix issue with wallet connection
dappforce · Aug 30, 2023 · 4dd6913 · 4dd6913
2 parents 0f3024c + a96b4c1
commit 4dd6913
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/src/components/auth/ProfileModal/contents/notifications/PushNotificationContent.tsx b/src/components/auth/ProfileModal/contents/notifications/PushNotificationContent.tsx
@@ -99,7 +99,12 @@ function DisableNotificationButton({
   }
 
   return (
-    <Button size='lg' onClick={handleClickDisable} isLoading={isLoading}>
+    <Button
+      size='lg'
+      variant='redOutline'
+      onClick={handleClickDisable}
+      isLoading={isLoading}
+    >
       Disable Notifications
     </Button>
   )

diff --git a/src/components/chats/ChatForm.tsx b/src/components/chats/ChatForm.tsx
@@ -97,7 +97,7 @@ export default function ChatForm({
       onError: (error, variables) => {
         showErrorSendingMessageToast(
           error,
-          'Create account failed',
+          'Creating account or sending message failed',
           variables.message,
           setMessageBody
         )

diff --git a/src/services/subsocial/hooks.ts b/src/services/subsocial/hooks.ts
@@ -5,10 +5,10 @@ import { SubsocialMutationConfig } from '@/subsocial-query/subsocial/types'
 import { useMutation, UseMutationResult } from '@tanstack/react-query'
 
 export function useWalletGetter() {
-  const address = useMyAccount((state) => state.address ?? '')
-  const signer = useMyAccount((state) => state.signer)
-
-  return async () => ({ address, signer })
+  return () => ({
+    address: useMyAccount.getState().address ?? '',
+    signer: useMyAccount.getState().signer,
+  })
 }
 
 export default function useCommonTxSteps<Data, ReturnValue>(

diff --git a/src/subsocial-query/subsocial/mutation.ts b/src/subsocial-query/subsocial/mutation.ts
@@ -19,7 +19,7 @@ type Apis = {
 }
 
 export function useSubsocialMutation<Data, Context = undefined>(
-  getWallet: () => Promise<WalletAccount>,
+  getWallet: () => Promise<WalletAccount> | WalletAccount,
   transactionGenerator: (
     data: Data,
     apis: Apis