@rango-dev/widget-embedded 0.30.1-next.6 → 0.30.1-next.8

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}
               />

package/src/types/config.ts

@@ -179,6 +179,8 @@ export type TrezorManifest = {
  * @property {boolean} customDestination - A boolean value indicating whether the user can input a custom
  * address for the transaction. If set to true, the widget will allow the user to input a custom
  * address for the destination.
+ * @property {{[blockchain: string]: string }} defaultCustomDestinations - The `defaultCustomDestinations` property is a map of supported `blockchain` names to an arbitrary blockchain address.
+ * You could use it to set a default custom destination for some blockchains.  e.g. {'BSC': '0x2be.....c1','ETH': '0x2be.....c1'}
  * @property {string} language - The language property is an optional string that specifies the
  * default language in which the widget should be displayed. If not provided, the widget will default to the
  * language of the user's browser.
@@ -219,6 +221,7 @@ export type WidgetConfig = {
   wallets?: (WalletType | ProviderInterface)[];
   multiWallets?: boolean;
   customDestination?: boolean;
+  defaultCustomDestinations?: { [blockchain: string]: string };
   language?: Language;
   theme?: WidgetTheme;
   externalWallets?: boolean;
@@ -227,7 +230,6 @@ export type WidgetConfig = {
   variant?: WidgetVariant;
   enableCentralizedSwappers?: boolean;
   signers?: SignersConfig;
-
   // These are likely to change or remove at anytime. Please use with a caution.
   __UNSTABLE_OR_INTERNAL__?: {
     walletConnectListedDesktopWalletLink?: string;

package/src/utils/swap.ts

@@ -722,7 +722,7 @@ export function shouldRetrySwap(pendingSwap: PendingSwap) {
 
 export function isConfirmSwapDisabled(
   fetching: boolean,
-  showCustomDestination: boolean,
+  isCustomDestinationOpen: boolean,
   customDestination: string | null,
   quote: SelectedQuote | null,
   selectedWallets: { walletType: string; chain: string }[],
@@ -752,9 +752,9 @@ export function isConfirmSwapDisabled(
       : false;
 
   return (
-    (!showCustomDestination && !everyWalletSelected) ||
-    (showCustomDestination && !customDestination) ||
-    (showCustomDestination &&
+    (!isCustomDestinationOpen && !everyWalletSelected) ||
+    (isCustomDestinationOpen && !customDestination) ||
+    (isCustomDestinationOpen &&
       !!customDestination &&
       (!customDestinationIsValid || !everyRequiredWalletSelected))
   );