fix: wallet not exist states

liftedinit · Dec 10, 2024 · 6994d01 · 6994d01
1 parent f059f3b
commit 6994d01
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/components/react/modal.tsx b/components/react/modal.tsx
@@ -83,12 +83,18 @@ export const TailwindModal: React.FC<
       // 1ms timeout prevents _render from determining the view to show first
       setTimeout(() => {
         const wallet = walletRepo?.getWallet(name);
-
-        if (wallet?.isWalletNotExist) {
+        console.log(wallet?.state);
+        if (
+          wallet?.walletInfo.name === 'cosmos-extension-metamask' &&
+          wallet.message?.includes("Cannot read properties of undefined (reading 'request')")
+        ) {
+          // This specific error indicates Metamask is not installed
           setCurrentView(ModalView.NotExist);
           setSelectedWallet(wallet);
-        }
-        if (wallet?.walletInfo.mode === 'wallet-connect') {
+        } else if (wallet?.isWalletNotExist) {
+          setCurrentView(ModalView.NotExist);
+          setSelectedWallet(wallet);
+        } else if (wallet?.walletInfo.mode === 'wallet-connect') {
           setCurrentView(ModalView.QRCode);
           setQRWallet(wallet);
         }
@@ -125,11 +131,11 @@ export const TailwindModal: React.FC<
         );
       case ModalView.Connecting:
         let subtitle: string;
-        if (currentWalletData!.mode === 'wallet-connect') {
+        if (currentWalletData!?.mode === 'wallet-connect') {
           subtitle = `Approve ${currentWalletData!.prettyName} connection request on your mobile.`;
         } else {
           subtitle = `Open the ${
-            currentWalletData!.prettyName
+            currentWalletData!?.prettyName
           } browser extension to connect your wallet.`;
         }
 

diff --git a/components/react/views/Error.tsx b/components/react/views/Error.tsx
@@ -46,7 +46,7 @@ export const Error = ({
         <div className="p-3 border rounded-full border-red-600 mx-auto aspect-1 flex-shrink-0">
           <Image
             src={
-              currentWalletName === 'Cosmos MetaMask Extension'
+              currentWalletName === 'cosmos-extension-metamask'
                 ? '/metamask.svg'
                 : getRealLogo(logo)
             }

diff --git a/components/react/views/NotExist.tsx b/components/react/views/NotExist.tsx
@@ -28,7 +28,7 @@ export const NotExist = ({
           <ChevronLeftIcon className="w-5 h-5" aria-hidden="true" />
         </button>
         <Dialog.Title as="h3" className="text-lg font-semibold">
-          {name}
+          {name === 'Cosmos MetaMask Extension' ? 'Metamask' : name}
         </Dialog.Title>
         <button
           type="button"
@@ -44,16 +44,19 @@ export const NotExist = ({
           alt={name}
           className="flex-shrink-0 w-16 h-16 mx-auto aspect-1"
         />
-        <p className="mt-3 font-medium text-black dark:text-white">Install {name}</p>
+        <p className="mt-3 font-medium text-black dark:text-white">
+          Install {name === 'Cosmos MetaMask Extension' ? 'Metamask' : name}
+        </p>
         <p className="mt-1 text-sm text-gray-500 dark:text-white/75">
-          To connect your {name} wallet, install the browser extension.
+          To connect your {name === 'Cosmos MetaMask Extension' ? 'Metamask' : name} wallet, install
+          the browser extension.
         </p>
         <button
           className={`rounded-lg btn-primary btn btn-md ${name.length >= 12 ? 'w-1/2' : 'w-1/3'} mx-auto inline-flex justify-center items-center py-2.5 font-medium mt-4 text-white`}
           onClick={onInstall}
         >
           <ArrowDownTrayIcon className="flex-shrink-0 w-5 h-5 mr-2 text-white" />
-          Install {name}
+          Install {name === 'Cosmos MetaMask Extension' ? 'Metamask' : name}
         </button>
       </div>
     </div>

diff --git a/components/react/views/WalletList.tsx b/components/react/views/WalletList.tsx
@@ -25,7 +25,7 @@ export const WalletList = ({
       wallet.walletInfo.prettyName
     )
   );
-  console.log(wallets);
+
   const mobile = wallets.filter(wallet =>
     ['Wallet Connect', 'Keplr Mobile', 'Cosmostation Mobile', 'Leap Mobile'].includes(
       wallet.walletInfo.prettyName

diff --git a/pages/groups/create.tsx b/pages/groups/create.tsx
@@ -26,7 +26,7 @@ export default function CreateGroup() {
   const [currentStep, setCurrentStep] = useState(1);
   const [formData, dispatch] = useReducer(formDataReducer, initialFormData);
   const { address } = useChain(chainName);
-  console.log(formData);
+
   const nextStep = () => {
     if (currentStep < 5) {
       setCurrentStep(currentStep + 1);