@rango-dev/widget-embedded 0.45.1-next.1 → 0.45.1-next.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/widget-embedded",
-  "version": "0.45.1-next.1",
+  "version": "0.45.1-next.3",
   "license": "MIT",
   "type": "module",
   "source": "./src/index.ts",
@@ -25,15 +25,15 @@
     "@lingui/core": "4.2.1",
     "@lingui/react": "4.2.1",
     "@rango-dev/logging-core": "^0.9.1-next.0",
-    "@rango-dev/provider-all": "^0.48.1-next.1",
+    "@rango-dev/provider-all": "^0.48.1-next.2",
     "@rango-dev/queue-manager-core": "^0.30.1-next.0",
-    "@rango-dev/queue-manager-rango-preset": "^0.47.1-next.1",
+    "@rango-dev/queue-manager-rango-preset": "^0.47.1-next.2",
     "@rango-dev/queue-manager-react": "^0.30.1-next.0",
     "@rango-dev/signer-solana": "^0.41.1-next.0",
-    "@rango-dev/ui": "^0.48.1-next.1",
-    "@rango-dev/wallets-core": "^0.45.1-next.1",
-    "@rango-dev/wallets-react": "^0.32.1-next.1",
-    "@rango-dev/wallets-shared": "^0.46.1-next.1",
+    "@rango-dev/ui": "^0.48.1-next.3",
+    "@rango-dev/wallets-core": "^0.45.1-next.2",
+    "@rango-dev/wallets-react": "^0.32.1-next.2",
+    "@rango-dev/wallets-shared": "^0.46.1-next.2",
     "bignumber.js": "^9.1.1",
     "copy-to-clipboard": "^3.3.3",
     "dayjs": "^1.11.7",

package/src/components/Slippage/Slippage.styles.ts

@@ -32,26 +32,3 @@ export const SlippageChip = styled(Chip, {
   width: '61px',
   flexShrink: 0,
 });
-
-export const SlippageTextFieldContainer = styled('div', {
-  outlineWidth: 1,
-  outlineStyle: 'solid',
-  borderRadius: '$xs',
-  flex: 1,
-  variants: {
-    status: {
-      safe: {
-        outlineColor: '$secondary500',
-      },
-      error: {
-        outlineColor: '$error500',
-      },
-      warning: {
-        outlineColor: '$warning500',
-      },
-      empty: {
-        outlineWidth: 0,
-      },
-    },
-  },
-});

package/src/components/Slippage/Slippage.tsx

@@ -21,7 +21,6 @@ import {
   Head,
   SlippageChip,
   SlippageChipsContainer,
-  SlippageTextFieldContainer,
 } from './Slippage.styles';
 import { SlippageTooltipContent } from './SlippageTooltipContent';
 
@@ -92,32 +91,31 @@ export function Slippage() {
             />
           );
         })}
-        <SlippageTextFieldContainer
+
+        <TextField
+          type="number"
+          min="0.01"
+          max="30"
+          step="0.01"
           status={
-            slippageValidation?.type || (customSlippage ? 'safe' : 'empty')
-          }>
-          <TextField
-            type="number"
-            min="0.01"
-            max="30"
-            step="0.01"
-            id="widget-slippage-chip-text-input"
-            onInput={onInput}
-            fullWidth
-            variant="contained"
-            value={customSlippage === null ? '' : customSlippage}
-            color="dark"
-            onChange={onSlippageValueChange}
-            suffix={
-              customSlippage && (
-                <Typography variant="body" size="small">
-                  %
-                </Typography>
-              )
-            }
-            placeholder={i18n.t('Custom')}
-          />
-        </SlippageTextFieldContainer>
+            slippageValidation?.type || (customSlippage ? 'success' : 'default')
+          }
+          id="widget-slippage-chip-text-input"
+          onInput={onInput}
+          fullWidth
+          variant="contained"
+          value={customSlippage === null ? '' : customSlippage}
+          color="dark"
+          onChange={onSlippageValueChange}
+          suffix={
+            customSlippage && (
+              <Typography variant="body" size="small">
+                %
+              </Typography>
+            )
+          }
+          placeholder={i18n.t('Custom')}
+        />
       </SlippageChipsContainer>
 
       {slippageValidation && (

package/src/containers/Wallets/useUpdates.ts

@@ -77,7 +77,7 @@ export function useUpdates(params: UseUpdatesParams): UseUpdates {
     );
 
     if (data.length) {
-      void newWalletConnected(data, info.namespace);
+      void newWalletConnected(data, info.namespace, state.derivationPath);
     }
   };
 

package/src/store/slices/wallets.ts

@@ -100,7 +100,11 @@ export interface WalletsSlice {
       namespaces?: Namespace[];
     }
   ) => void;
-  addConnectedWallet: (accounts: Wallet[], namespace?: Namespace) => void;
+  addConnectedWallet: (
+    accounts: Wallet[],
+    namespace?: Namespace,
+    derivationPath?: string
+  ) => void;
   setWalletsAsSelected: (
     wallets: { walletType: string; chain: string }[]
   ) => void;
@@ -109,7 +113,8 @@ export interface WalletsSlice {
    */
   newWalletConnected: (
     accounts: Wallet[],
-    namespace?: Namespace
+    namespace?: Namespace,
+    derivationPath?: string
   ) => Promise<void>;
   disconnectNamespaces: (walletType: string, namespaces: Namespace[]) => void;
   /**
@@ -231,7 +236,7 @@ export const createWalletsSlice = keepLastUpdated<AppStoreState, WalletsSlice>(
         };
       });
     },
-    addConnectedWallet: (accounts, namespace) => {
+    addConnectedWallet: (accounts, namespace, derivationPath) => {
       /*
        * When we are going to add a new account, there are two thing that can be happens:
        * 1. Wallet hasn't add yet.
@@ -276,6 +281,7 @@ export const createWalletsSlice = keepLastUpdated<AppStoreState, WalletsSlice>(
               walletType: account.walletType,
               selected: shouldMarkWalletAsSelected,
               namespace: namespace,
+              derivationPath: derivationPath,
               loading: false,
               error: false,
             };
@@ -435,13 +441,13 @@ export const createWalletsSlice = keepLastUpdated<AppStoreState, WalletsSlice>(
         connectedWallets: nextConnectedWalletsWithUpdatedSelectedStatus,
       });
     },
-    newWalletConnected: async (accounts, namespace) => {
+    newWalletConnected: async (accounts, namespace, derivationPath) => {
       eventEmitter.emit(WidgetEvents.WalletEvent, {
         type: WalletEventTypes.CONNECT,
         payload: { walletType: accounts[0].walletType, accounts },
       });
 
-      get().addConnectedWallet(accounts, namespace);
+      get().addConnectedWallet(accounts, namespace, derivationPath);
 
       void get().fetchBalances(accounts);
     },

package/src/types/wallets.ts

@@ -6,6 +6,7 @@ export interface Wallet {
   address: string;
   walletType: WalletType;
   isContractWallet?: boolean;
+  derivationPath?: string;
 }
 
 export type Balance = {

package/src/utils/swap.ts

@@ -534,13 +534,18 @@ export function getWalletsForNewSwap(selectedWallets: Wallet[]) {
   const wallets = selectedWallets.reduce(
     (
       selectedWalletsMap: {
-        [p: string]: { address: string; walletType: WalletType };
+        [p: string]: {
+          address: string;
+          walletType: WalletType;
+          derivationPath?: string;
+        };
       },
       selectedWallet
     ) => (
       (selectedWalletsMap[selectedWallet.chain] = {
         address: selectedWallet.address,
         walletType: selectedWallet.walletType,
+        derivationPath: selectedWallet.derivationPath,
       }),
       selectedWalletsMap
     ),