@rango-dev/widget-embedded 0.30.1-next.7 → 0.30.1-next.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/widget-embedded",
-  "version": "0.30.1-next.7",
+  "version": "0.30.1-next.9",
   "license": "MIT",
   "type": "module",
   "source": "./src/index.ts",
@@ -24,15 +24,15 @@
   "dependencies": {
     "@lingui/core": "4.2.1",
     "@lingui/react": "4.2.1",
-    "@rango-dev/logging-core": "^0.5.1-next.0",
-    "@rango-dev/provider-all": "^0.35.2-next.0",
-    "@rango-dev/queue-manager-core": "^0.26.0",
-    "@rango-dev/queue-manager-rango-preset": "^0.35.2-next.0",
-    "@rango-dev/queue-manager-react": "^0.26.0",
-    "@rango-dev/signer-solana": "^0.30.1-next.0",
-    "@rango-dev/ui": "^0.36.1-next.2",
-    "@rango-dev/wallets-react": "^0.21.2-next.0",
-    "@rango-dev/wallets-shared": "^0.35.1",
+    "@rango-dev/logging-core": "^0.5.1-next.1",
+    "@rango-dev/provider-all": "^0.35.2-next.2",
+    "@rango-dev/queue-manager-core": "^0.26.1-next.0",
+    "@rango-dev/queue-manager-rango-preset": "^0.35.2-next.1",
+    "@rango-dev/queue-manager-react": "^0.26.1-next.0",
+    "@rango-dev/signer-solana": "^0.30.1-next.1",
+    "@rango-dev/ui": "^0.36.1-next.3",
+    "@rango-dev/wallets-react": "^0.21.2-next.1",
+    "@rango-dev/wallets-shared": "^0.35.2-next.0",
     "bignumber.js": "^9.1.1",
     "copy-to-clipboard": "^3.3.3",
     "dayjs": "^1.11.7",
@@ -53,4 +53,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/src/components/ConfirmWalletsModal/WalletList.tsx

@@ -260,14 +260,26 @@ export function WalletList(props: PropTypes) {
             })
           : conciseAddress;
 
-        const onClick = async () => {
+        const onSelectableWalletClick = async () => {
           if (wallet.state === WalletState.DISCONNECTED) {
-            if (!!wallet.namespaces) {
-              handleOpenNamespacesModal(wallet);
+            if (!!wallet.namespaces?.length) {
+              if (wallet.namespaces.length > 1) {
+                handleOpenNamespacesModal(wallet);
+              } else if (wallet.needsDerivationPath) {
+                setDerivationPathModalState({
+                  open: true,
+                  providerType: wallet.type,
+                  providerImage: wallet.image,
+                  namespace: wallet.namespaces[0],
+                });
+              } else {
+                void handleClick(wallet.type);
+              }
             } else {
               void handleClick(wallet.type);
             }
           } else if (!!wallet.namespaces && !conciseAddress) {
+            // wallet is connected on a different namespace
             await disconnectWallet(wallet.type);
             handleOpenNamespacesModal(wallet);
           } else if (couldAddExperimentalChain) {
@@ -409,7 +421,7 @@ export function WalletList(props: PropTypes) {
             <SelectableWallet
               key={wallet.type}
               description={connectedWalletDescription}
-              onClick={onClick}
+              onClick={onSelectableWalletClick}
               selected={isSelected(wallet.type, chain)}
               disabled={!isActiveTab}
               {...wallet}

package/src/components/SwapDetailsModal/SwapDetailsModal.WalletState.tsx

@@ -68,6 +68,33 @@ export const WalletStateContent = (props: WalletStateContentProps) => {
     }
   };
 
+  const handleWalletItemClick = () => {
+    if (!!walletType && !!walletInfo) {
+      if (!!walletInfo.namespaces?.length) {
+        if (walletInfo.namespaces.length > 1) {
+          setNamespacesModalState({
+            open: true,
+            providerType: walletType,
+            providerImage: walletInfo.img,
+            availableNamespaces: walletInfo.namespaces,
+            singleNamespace: walletInfo.singleNamespace,
+          });
+        } else if (walletInfo.needsDerivationPath) {
+          setDerivationPathModalState({
+            open: true,
+            providerType: walletType,
+            providerImage: walletInfo.img,
+            namespace: walletInfo.namespaces[0],
+          });
+        } else {
+          connect(walletType).catch((error) => debug(error));
+        }
+      } else {
+        connect(walletType).catch((error) => debug(error));
+      }
+    }
+  };
+
   const handleConfirmNamespaces = (selectedNamespaces: Namespace[]) => {
     if (
       !!walletInfo?.needsDerivationPath &&
@@ -117,19 +144,7 @@ export const WalletStateContent = (props: WalletStateContentProps) => {
             link={walletInfo.installLink}
             disabled={walletButtonDisabled}
             // TODO we need to show an error modal when user reject the connection
-            onClick={async () => {
-              if (walletInfo.namespaces) {
-                setNamespacesModalState({
-                  open: true,
-                  providerType: walletType,
-                  providerImage: walletInfo.img,
-                  availableNamespaces: walletInfo.namespaces,
-                  singleNamespace: walletInfo.singleNamespace,
-                });
-              } else {
-                connect(walletType).catch((error) => debug(error));
-              }
-            }}
+            onClick={handleWalletItemClick}
           />
         </WalletContainer>
       )}

package/src/pages/WalletsPage.tsx

@@ -126,21 +126,35 @@ export function WalletsPage() {
 
   const filteredWallets = filterWalletsByCategory(list, blockchainCategory);
 
-  const handleWalletItemClick = (type: string, wallet: WalletInfoWithExtra) => {
+  const handleWalletItemClick = (wallet: WalletInfoWithExtra) => {
     if (isSingleWalletActive(list, config.multiWallets)) {
       return;
     }
 
-    if (!!wallet.namespaces && wallet.state === WalletState.DISCONNECTED) {
-      setNamespacesModalState({
-        open: true,
-        providerType: type,
-        providerImage: wallet.image,
-        availableNamespaces: wallet.namespaces,
-        singleNamespace: wallet.singleNamespace,
-      });
+    if (
+      !!wallet.namespaces?.length &&
+      wallet.state === WalletState.DISCONNECTED
+    ) {
+      if (wallet.namespaces.length > 1) {
+        setNamespacesModalState({
+          open: true,
+          providerType: wallet.type,
+          providerImage: wallet.image,
+          availableNamespaces: wallet.namespaces,
+          singleNamespace: wallet.singleNamespace,
+        });
+      } else if (wallet.needsDerivationPath) {
+        setDerivationPathModalState({
+          open: true,
+          providerType: wallet.type,
+          providerImage: wallet.image,
+          namespace: wallet.namespaces[0],
+        });
+      } else {
+        void handleClick(wallet.type);
+      }
     } else {
-      void handleClick(type);
+      void handleClick(wallet.type);
     }
   };
 
@@ -208,7 +222,7 @@ export function WalletsPage() {
                 key={key}
                 {...wallet}
                 container={getContainer()}
-                onClick={(type) => handleWalletItemClick(type, wallet)}
+                onClick={() => handleWalletItemClick(wallet)}
                 isLoading={fetchMetaStatus === 'loading'}
                 disabled={!isActiveTab}
               />