@rango-dev/widget-embedded 0.1.20-next.8 → 0.2.0

package/dist/pages/SwapDetailsPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SwapDetailsPage.d.ts","sourceRoot":"","sources":["../../src/pages/SwapDetailsPage.tsx"],"names":[],"mappings":";AA+BA,wBAAgB,eAAe,gBA8H9B"}
+{"version":3,"file":"SwapDetailsPage.d.ts","sourceRoot":"","sources":["../../src/pages/SwapDetailsPage.tsx"],"names":[],"mappings":";AA6BA,wBAAgB,eAAe,gBAqI9B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/widget-embedded",
-  "version": "0.1.20-next.8",
+  "version": "0.2.0",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",
@@ -17,13 +17,13 @@
     "lint": "eslint \"**/*.{ts,tsx}\" --ignore-path ../../.eslintignore"
   },
   "dependencies": {
-    "@rango-dev/provider-all": "^0.1.22-next.5",
-    "@rango-dev/queue-manager-core": "^0.1.15-next.4",
-    "@rango-dev/queue-manager-rango-preset": "^0.1.15-next.6",
-    "@rango-dev/queue-manager-react": "^0.1.14-next.5",
-    "@rango-dev/ui": "^0.1.16-next.8",
-    "@rango-dev/wallets-core": "^0.1.16-next.6",
-    "@rango-dev/wallets-shared": "^0.1.15-next.5",
+    "@rango-dev/provider-all": "^0.2.0",
+    "@rango-dev/queue-manager-core": "^0.2.0",
+    "@rango-dev/queue-manager-rango-preset": "^0.1.14",
+    "@rango-dev/queue-manager-react": "^0.1.13",
+    "@rango-dev/ui": "^0.2.0",
+    "@rango-dev/wallets-core": "^0.2.0",
+    "@rango-dev/wallets-shared": "^0.2.0",
     "bignumber.js": "^9.1.1",
     "copy-to-clipboard": "^3.3.3",
     "dayjs": "^1.11.7",

package/src/QueueManager.tsx

@@ -18,7 +18,7 @@ import { walletAndSupportedChainsNames } from './utils/wallets';
 import { isEvmBlockchain } from 'rango-sdk';
 import { getConfig } from './utils/configs';
 
-function QueueManager(props: PropsWithChildren<{}>) {
+function QueueManager(props: PropsWithChildren) {
   const {
     providers,
     getSigners,
@@ -103,10 +103,12 @@ function QueueManager(props: PropsWithChildren<{}>) {
     },
     getSigners,
     //todo: remove Network type
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     //@ts-ignore
     wallets,
     providers: allProviders,
     switchNetwork,
+    canSwitchNetworkTo,
     connect,
     state,
     isMobileWallet,
@@ -120,8 +122,7 @@ function QueueManager(props: PropsWithChildren<{}>) {
       onPersistedDataLoaded={(manager) => {
         checkWaitingForNetworkChange(manager);
       }}
-      isPaused={false}
-    >
+      isPaused={false}>
       {props.children}
     </ManagerProvider>
   );

package/src/components/AppRouter.tsx

@@ -5,6 +5,7 @@ import { WalletType } from '@rango-dev/wallets-shared';
 import { isEvmBlockchain } from 'rango-types';
 import { UpdateUrl } from './UpdateUrl';
 import { useMetaStore } from '../store/meta';
+import { useWallets } from '@rango-dev/wallets-core';
 
 export function AppRouter({
   children,
@@ -17,6 +18,7 @@ export function AppRouter({
   const isRouterInContext = useInRouterContext();
   const Router = isRouterInContext ? Fragment : MemoryRouter;
   const { blockchains } = useMetaStore.use.meta();
+  const { canSwitchNetworkTo } = useWallets();
 
   const evmChains = blockchains.filter(isEvmBlockchain);
 
@@ -25,7 +27,9 @@ export function AppRouter({
     clearDisconnectedWallet: props.clearDisconnectedWallet,
     disconnectedWallet: props.disconnectedWallet,
     evmChains,
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
     notifier: () => {},
+    canSwitchNetworkTo,
   });
 
   return (

package/src/pages/SwapDetailsPage.tsx

@@ -24,14 +24,12 @@ import {
   isNetworkStatusInWarningState,
   shouldRetrySwap,
 } from '../utils/swap';
-//@ts-ignore
-import { t } from 'i18next';
 import { SwapDetailsPlaceholder } from '../components/SwapDetailsPlaceholder';
 import { getFormatedPendingSwap } from '../utils/routing';
 
 export function SwapDetailsPage() {
   const selectedSwapRequestId = useUiStore.use.selectedSwapRequestId();
-  const { canSwitchNetworkTo, connect } = useWallets();
+  const { canSwitchNetworkTo, connect, getWalletInfo } = useWallets();
   const retry = useBestRouteStore.use.retry();
   const navigate = useNavigate();
   const { navigateBackFrom } = useNavigateBack();
@@ -44,6 +42,7 @@ export function SwapDetailsPage() {
   );
 
   const onCancel = () => {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-non-null-asserted-optional-chain
     const swap = manager?.get(selectedSwap?.id!);
     if (swap) cancelSwap(swap);
   };
@@ -77,14 +76,20 @@ export function SwapDetailsPage() {
 
   const shouldRetry = shouldRetrySwap(swap);
 
-  const switchNetwork =
-    !!currentStepBlockchain &&
-    !!currentStepWallet?.walletType &&
+  const isMobileWallet = (walletType: string): boolean =>
+    !!getWalletInfo(walletType)?.mobileWallet;
+
+  const showSwitchNetwork =
     currentStepNetworkStatus ===
       PendingSwapNetworkStatus.WaitingForNetworkChange &&
-    canSwitchNetworkTo(currentStepWallet?.walletType, currentStepBlockchain)
-      ? connect.bind(null, currentStepWallet.walletType, currentStepBlockchain)
-      : undefined;
+    !!currentStepBlockchain &&
+    !!currentStepWallet?.walletType &&
+    (isMobileWallet(currentStepWallet.walletType) ||
+      canSwitchNetworkTo(currentStepWallet.walletType, currentStepBlockchain));
+
+  const switchNetwork = showSwitchNetwork
+    ? connect.bind(null, currentStepWallet.walletType, currentStepBlockchain)
+    : undefined;
 
   const lastConvertedTokenInFailedSwap =
     getLastConvertedTokenInFailedSwap(swap);