@rango-dev/widget-embedded 0.5.1-next.17 → 0.5.1-next.18

package/dist/store/wallets.d.ts

@@ -27,7 +27,7 @@ interface WalletsStore {
     initSelectedWallets: () => void;
     setSelectedWallet: (wallet: SelectableWallet) => void;
     clearConnectedWallet: () => void;
-    getOneOfWalletsDetails: (account: Wallet) => void;
+    getWalletsDetails: (accounts: Wallet[], shouldRetry?: boolean) => void;
     setCustomDestination: (customDestination: string) => void;
 }
 export declare const useWalletsStore: {
@@ -51,7 +51,7 @@ export declare const useWalletsStore: {
         initSelectedWallets: () => () => void;
         setSelectedWallet: () => (wallet: SelectableWallet) => void;
         clearConnectedWallet: () => () => void;
-        getOneOfWalletsDetails: () => (account: Wallet) => void;
+        getWalletsDetails: () => (accounts: Wallet[], shouldRetry?: boolean) => void;
         setCustomDestination: () => (customDestination: string) => void;
     };
 };

package/dist/store/wallets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallets.d.ts","sourceRoot":"","sources":["../../src/store/wallets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAgBvD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AAEF,MAAM,WAAW,eAAgB,SAAQ,MAAM;IAC7C,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,UAAU,YAAY;IACpB,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC5C,gBAAgB,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IACnD,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,iBAAiB,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACtD,oBAAoB,EAAE,MAAM,IAAI,CAAC;IACjC,sBAAsB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,oBAAoB,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3D;AAED,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;wCATA,MAAM,EAAE,KAAK,IAAI;6CACZ,UAAU,KAAK,IAAI;yCACvB,IAAI;0CACH,gBAAgB,KAAK,IAAI;0CACzB,IAAI;gDACE,MAAM,KAAK,IAAI;wDACP,MAAM,KAAK,IAAI;;CA0H1D,CAAC;AAyBF,eAAO,MAAM,uBAAuB,UAAW,YAAY,YACA,CAAC"}
+{"version":3,"file":"wallets.d.ts","sourceRoot":"","sources":["../../src/store/wallets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAgBvD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AAEF,MAAM,WAAW,eAAgB,SAAQ,MAAM;IAC7C,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,UAAU,YAAY;IACpB,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC5C,gBAAgB,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IACnD,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,iBAAiB,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACtD,oBAAoB,EAAE,MAAM,IAAI,CAAC;IACjC,iBAAiB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACvE,oBAAoB,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3D;AAED,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;wCATA,MAAM,EAAE,KAAK,IAAI;6CACZ,UAAU,KAAK,IAAI;yCACvB,IAAI;0CACH,gBAAgB,KAAK,IAAI;0CACzB,IAAI;4CACF,MAAM,EAAE,gBAAgB,OAAO,KAAK,IAAI;wDAC5B,MAAM,KAAK,IAAI;;CAoJ1D,CAAC;AAyBF,eAAO,MAAM,uBAAuB,UAAW,YAAY,YACA,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/widget-embedded",
-  "version": "0.5.1-next.17",
+  "version": "0.5.1-next.18",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",

package/src/components/WidgetEvents.tsx

@@ -10,7 +10,7 @@ import { useWalletsStore } from '../store/wallets';
 
 export function WidgetEvents() {
   const connectedWallets = useWalletsStore.use.connectedWallets();
-  const getOneOfWalletsDetails = useWalletsStore.use.getOneOfWalletsDetails();
+  const getWalletsDetails = useWalletsStore.use.getWalletsDetails();
 
   const widgetEvents = useEvents();
 
@@ -20,7 +20,7 @@ export function WidgetEvents() {
       const shouldRefetchBalance =
         (event.type === StepEventType.TX_EXECUTION &&
           event.status === StepExecutionEventStatus.TX_SENT &&
-          isApprovalTX(step)) ||
+          !isApprovalTX(step)) ||
         event.type === StepEventType.SUCCEEDED;
 
       if (shouldRefetchBalance) {
@@ -33,8 +33,8 @@ export function WidgetEvents() {
             (wallet) => wallet.chain === step?.toBlockchain
           );
 
-        fromAccount && getOneOfWalletsDetails(fromAccount);
-        toAccount && getOneOfWalletsDetails(toAccount);
+        fromAccount && getWalletsDetails([fromAccount]);
+        toAccount && getWalletsDetails([toAccount]);
       }
     });
 

package/src/store/wallets.ts

@@ -45,7 +45,7 @@ interface WalletsStore {
   initSelectedWallets: () => void;
   setSelectedWallet: (wallet: SelectableWallet) => void;
   clearConnectedWallet: () => void;
-  getOneOfWalletsDetails: (account: Wallet) => void;
+  getWalletsDetails: (accounts: Wallet[], shouldRetry?: boolean) => void;
   setCustomDestination: (customDestination: string) => void;
 }
 
@@ -56,7 +56,7 @@ export const useWalletsStore = createSelectors(
       selectedWallets: [],
       customDestination: '',
       connectWallet: (accounts) => {
-        const getOneOfWalletsDetails = get().getOneOfWalletsDetails;
+        const getWalletsDetails = get().getWalletsDetails;
         set((state) => ({
           connectedWallets: state.connectedWallets
             .filter((wallet) => wallet.walletType !== accounts[0].walletType)
@@ -72,7 +72,7 @@ export const useWalletsStore = createSelectors(
               }))
             ),
         }));
-        accounts.forEach(async (account) => getOneOfWalletsDetails(account));
+        getWalletsDetails(accounts);
       },
       disconnectWallet: (walletType) => {
         set((state) => ({
@@ -131,26 +131,50 @@ export const useWalletsStore = createSelectors(
           connectedWallets: [],
           selectedWallets: [],
         })),
-      getOneOfWalletsDetails: async (account: Wallet) => {
-        const tokens = useMetaStore.getState().meta.tokens;
+      getWalletsDetails: async (accounts, shouldRetry = true) => {
+        const getWalletsDetails = get().getWalletsDetails;
+        const { tokens } = useMetaStore.getState().meta;
         set((state) => ({
           connectedWallets: state.connectedWallets.map((wallet) => {
-            return isAccountAndWalletMatched(account, wallet)
+            return accounts.find((account) =>
+              isAccountAndWalletMatched(account, wallet)
+            )
               ? { ...wallet, loading: true }
               : wallet;
           }),
         }));
         try {
-          const response = await httpService().getWalletsDetails([
-            { address: account.address, blockchain: account.chain },
-          ]);
-          const retrivedBalance = response.wallets[0];
+          const data = accounts.map(({ address, chain }) => ({
+            address,
+            blockchain: chain,
+          }));
+          const response = await httpService().getWalletsDetails(data);
+          const retrivedBalance = response.wallets;
           if (retrivedBalance) {
             set((state) => ({
               connectedWallets: state.connectedWallets.map(
                 (connectedWallet) => {
-                  return isAccountAndWalletMatched(account, connectedWallet)
-                    ? makeBalanceFor(account, retrivedBalance, tokens)
+                  const matchedAccount = accounts.find((account) =>
+                    isAccountAndWalletMatched(account, connectedWallet)
+                  );
+                  const retrivedBalanceAccount = retrivedBalance.find(
+                    (balance) =>
+                      balance.address === connectedWallet.address &&
+                      balance.blockChain === connectedWallet.chain
+                  );
+                  if (
+                    retrivedBalanceAccount?.failed &&
+                    matchedAccount &&
+                    shouldRetry
+                  ) {
+                    getWalletsDetails([matchedAccount], false);
+                  }
+                  return matchedAccount && retrivedBalanceAccount
+                    ? makeBalanceFor(
+                        matchedAccount,
+                        retrivedBalanceAccount,
+                        tokens
+                      )
                     : connectedWallet;
                 }
               ),
@@ -159,7 +183,9 @@ export const useWalletsStore = createSelectors(
         } catch (error) {
           set((state) => ({
             connectedWallets: state.connectedWallets.map((balance) => {
-              return isAccountAndWalletMatched(account, balance)
+              return accounts.find((account) =>
+                isAccountAndWalletMatched(account, balance)
+              )
                 ? resetConnectedWalletState(balance)
                 : balance;
             }),