@rango-dev/widget-embedded 0.23.1-next.25 → 0.23.1-next.27

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

@@ -1 +1 @@
-{"version":3,"file":"ConfirmSwapPage.d.ts","sourceRoot":"","sources":["../../src/pages/ConfirmSwapPage.tsx"],"names":[],"mappings":"AAoBA,OAAO,KAAuD,MAAM,OAAO,CAAC;AAmD5E,wBAAgB,eAAe,sBAmU9B"}
+{"version":3,"file":"ConfirmSwapPage.d.ts","sourceRoot":"","sources":["../../src/pages/ConfirmSwapPage.tsx"],"names":[],"mappings":"AAoBA,OAAO,KAAuD,MAAM,OAAO,CAAC;AAmD5E,wBAAgB,eAAe,sBAuU9B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/widget-embedded",
-  "version": "0.23.1-next.25",
+  "version": "0.23.1-next.27",
   "license": "MIT",
   "type": "module",
   "source": "./src/index.ts",
@@ -21,6 +21,7 @@
   "dependencies": {
     "@lingui/core": "4.2.1",
     "@lingui/react": "4.2.1",
+    "@rango-dev/logging-core": "^0.1.1-next.0",
     "@rango-dev/provider-all": "^0.28.1-next.2",
     "@rango-dev/queue-manager-core": "^0.26.0",
     "@rango-dev/queue-manager-rango-preset": "^0.28.1-next.3",

package/src/components/SwapDetails/SwapDetails.tsx

@@ -109,6 +109,8 @@ export function SwapDetails(props: SwapDetailsProps) {
       if (swap.status === 'success' || swap.status === 'failed') {
         setShowCompletedModal(swap.status);
         setAsRead(swap.requestId);
+      } else if (showCompletedModal) {
+        setShowCompletedModal(null);
       }
     }
   }, [swap.status, swap.requestId]);

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

@@ -1,5 +1,6 @@
 import type { WalletStateContentProps } from './SwapDetailsModal.types';
 
+import { debug } from '@rango-dev/logging-core';
 import { MessageBox, Wallet } from '@rango-dev/ui';
 import { useWallets } from '@rango-dev/wallets-react';
 import React from 'react';
@@ -39,7 +40,10 @@ export const WalletStateContent = (props: WalletStateContentProps) => {
             state={walletState}
             link={walletInfo.installLink}
             disabled={walletButtonDisabled}
-            onClick={async () => connect(walletType)}
+            // TODO we need to show an error modal when user reject the connection
+            onClick={async () =>
+              connect(walletType).catch((error) => debug(error))
+            }
           />
         </WalletContainer>
       )}

package/src/constants/index.ts

@@ -2,7 +2,7 @@ import { UI_ID } from '@rango-dev/ui';
 
 export const RANGO_PUBLIC_API_KEY = 'c6381a79-2817-4602-83bf-6a641a409e32';
 export const DEFAULT_BASE_URL = 'https://api.rango.exchange';
-export const SCANNER_BASE_URL = 'https://scan.rango.exchange';
+export const SCANNER_BASE_URL = 'https://explorer.rango.exchange';
 
 export const WIDGET_UI_ID = {
   SWAP_BOX_ID: 'rango-swap-box',

package/src/hooks/useWalletList.ts

@@ -109,6 +109,18 @@ export function useWalletList(params: Params) {
    * but we have ethereum injected
    */
   const shouldShowDefaultInjectedWallet = (wallets: WalletInfo[]) => {
+    // don't show default injected wallet when it's not installed
+    const defaultWallet = wallets.find(
+      (wallet) => wallet.type === WalletTypes.DEFAULT
+    );
+    if (!defaultWallet || defaultWallet.state === WalletState.NOT_INSTALLED) {
+      return false;
+    }
+
+    /*
+     * if we have another evm wallet installed (except wallet connect),
+     * there is no need to show default injected wallet anymore
+     */
     const isEvmWalletInstalledExceptDefault = wallets.filter(
       (wallet) =>
         wallet.state != WalletState.NOT_INSTALLED &&

package/src/pages/ConfirmSwapPage.tsx

@@ -87,6 +87,7 @@ export function ConfirmSwapPage() {
   const { connectedWallets } = useWalletsStore();
   const showWalletsOnInit = !quoteWalletsConfirmed;
   const [showWallets, setShowWallets] = useState(false);
+  const [isConfirming, setIsConfirming] = useState(false);
   const { isActiveTab } = useUiStore();
   const disabledLiquiditySources = useAppStore().getDisabledLiquiditySources();
   const prevDisabledLiquiditySources = useRef(disabledLiquiditySources);
@@ -137,7 +138,9 @@ export function ConfirmSwapPage() {
   };
 
   const onConfirm = async () => {
+    setIsConfirming(true);
     await addNewSwap();
+    setIsConfirming(false);
   };
 
   const onStartConfirmSwap = async () => {
@@ -326,7 +329,7 @@ export function ConfirmSwapPage() {
               type="primary"
               size="large"
               fullWidth
-              loading={fetchingConfirmationQuote}
+              loading={fetchingConfirmationQuote || isConfirming}
               disabled={!!confirmSwapResult.error || !isActiveTab}
               onClick={onStartConfirmSwap}>
               {i18n.t('Start Swap')}
@@ -336,7 +339,8 @@ export function ConfirmSwapPage() {
             variant="contained"
             type="primary"
             size="large"
-            loading={fetchingConfirmationQuote}
+            loading={fetchingConfirmationQuote || isConfirming}
+            disabled={!isActiveTab}
             onClick={setShowWallets.bind(null, true)}>
             <WalletIcon size={24} />
           </IconButton>