Fix title disappearing and allow cancelling wallet connection. (#1317)

DA0-DA0 · Aug 2, 2023 · 941f687 · 941f687 · vercel · Aug 2, 2023
1 parent 4c33fce
commit 941f687
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git a/packages/stateful/components/wallet/WalletUi.tsx b/packages/stateful/components/wallet/WalletUi.tsx
@@ -12,7 +12,6 @@ import { WalletUiWalletList } from './WalletUiWalletList'
 
 export const WalletUi = (props: WalletModalProps) => {
   const {
-    isWalletDisconnected,
     isWalletConnecting,
     isWalletConnected,
     isWalletError,
@@ -46,18 +45,15 @@ export const WalletUi = (props: WalletModalProps) => {
   }
 
   const showWalletConnectQr = isWalletConnecting && qrState === State.Done
-  const title =
-    isWalletDisconnected || isWalletError
-      ? t('title.logInWith')
-      : isWalletConnecting
-      ? showWalletConnectQr
-        ? t('title.scanQrCode')
-        : current?.walletName.startsWith('web3auth_')
-        ? t('title.loggingInToService', { service: current.walletPrettyName })
-        : t('title.connectingToWallet', { wallet: current?.walletPrettyName })
-      : isWalletConnected
-      ? t('title.loggedIn')
-      : ''
+  const title = isWalletConnecting
+    ? showWalletConnectQr
+      ? t('title.scanQrCode')
+      : current?.walletName.startsWith('web3auth_')
+      ? t('title.loggingInToService', { service: current.walletPrettyName })
+      : t('title.connectingToWallet', { wallet: current?.walletPrettyName })
+    : isWalletConnected
+    ? t('title.loggedIn')
+    : t('title.logInWith')
 
   return (
     <Modal

diff --git a/packages/stateful/components/wallet/WalletUiWalletList.tsx b/packages/stateful/components/wallet/WalletUiWalletList.tsx
@@ -44,11 +44,9 @@ export const WalletUiWalletList = ({
               isConnectingTo(wallet) && 'animate-pulse'
             )}
             contentContainerClassName="flex-col !gap-3 justify-between items-center"
-            disabled={
-              // Disable if connecting to another wallet.
-              isWalletConnecting && !isConnectingTo(wallet)
+            onClick={() =>
+              isConnectingTo(wallet) ? walletRepo.disconnect() : connect(wallet)
             }
-            onClick={() => connect(wallet)}
             variant="secondary"
           >
             {!!wallet.walletInfo.logo && (
@@ -99,11 +97,11 @@ export const WalletUiWalletList = ({
                     isConnectingTo(wallet) && 'animate-pulse'
                   )}
                   contentContainerClassName="flex justify-center items-center"
-                  disabled={
-                    // Disable if connecting to another wallet.
-                    isWalletConnecting && !isConnectingTo(wallet)
+                  onClick={() =>
+                    isConnectingTo(wallet)
+                      ? walletRepo.disconnect()
+                      : connect(wallet)
                   }
-                  onClick={() => connect(wallet)}
                   variant="secondary"
                 >
                   {!!wallet.walletInfo.logo && (