fix: fix bugs after rebase

Author: Ikari-Shinji-re

widget/embedded/package.json

@@ -54,4 +54,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

widget/embedded/src/containers/Wallets/useUpdates.ts

@@ -17,6 +17,7 @@ import { type Network } from '@rango-dev/wallets-shared';
 import { isEvmBlockchain } from 'rango-sdk';
 
 import { useAppStore } from '../../store/AppStore';
+import { useQuoteStore } from '../../store/quote';
 import {
   prepareAccountsForWalletStore,
   walletAndSupportedChainsNames,
@@ -43,6 +44,7 @@ export function useUpdates(params: UseUpdatesParams): UseUpdates {
     removeBalancesForWallet,
     blockchains,
   } = useAppStore();
+  const quoteStore = useQuoteStore()();
 
   const { onConnectWalletHandler, onDisconnectWalletHandler } = params;
   const evmBasedChainNames = blockchains()
@@ -77,7 +79,12 @@ export function useUpdates(params: UseUpdatesParams): UseUpdates {
     );
 
     if (data.length) {
-      void newWalletConnected(data, info.namespace, state.derivationPath);
+      void newWalletConnected(
+        quoteStore,
+        data,
+        info.namespace,
+        state.derivationPath
+      );
     }
   };
 
@@ -101,7 +108,7 @@ export function useUpdates(params: UseUpdatesParams): UseUpdates {
     }
 
     if (event === Events.PROVIDER_DISCONNECTED) {
-      disconnectWallet(type);
+      disconnectWallet(type, quoteStore);
       if (!!onDisconnectWalletHandler.current) {
         onDisconnectWalletHandler.current(type);
       } else {
@@ -112,7 +119,7 @@ export function useUpdates(params: UseUpdatesParams): UseUpdates {
     }
 
     if (event === Events.NAMESPACE_DISCONNECTED) {
-      disconnectNamespaces(type, value);
+      disconnectNamespaces(type, value, quoteStore);
     }
   };
 
@@ -186,7 +193,7 @@ export function useUpdates(params: UseUpdatesParams): UseUpdates {
           supportedChainNames,
         });
       } else {
-        disconnectWallet(type);
+        disconnectWallet(type, quoteStore);
         if (!!onDisconnectWalletHandler.current) {
           onDisconnectWalletHandler.current(type);
         } else {

widget/embedded/src/hooks/useConfirmSwap/useConfirmSwap.ts

@@ -10,7 +10,8 @@ export function useConfirmSwap() {
   const { loading, cancelFetch, fetch: confirmSwap, addSwap } = useHandleSwap();
   const sourceWallet = useAppStore().selectedWallet('source');
   const destinationWallet = useAppStore().selectedWallet('destination');
-  const { customDestination, confirmSwapData } = useQuoteStore()();
+  const { customDestination, confirmSwapData, setConfirmSwapData } =
+    useQuoteStore()();
 
   const [confirmSwapResult, setConfirmSwapResult] =
     useState<ConfirmSwapFetchResult | null>({
@@ -35,11 +36,9 @@ export function useConfirmSwap() {
       return;
     }
 
-    useQuoteStore.setState({
-      confirmSwapData: {
-        proceedAnyway: false,
-        quoteData: result.quoteData,
-      },
+    setConfirmSwapData({
+      proceedAnyway: false,
+      quoteData: result.quoteData,
     });
   };
 

widget/embedded/src/hooks/useHandleSwap/useHandleSwap.ts

@@ -12,6 +12,7 @@ import { useQuoteStore } from '../../store/quote';
 import { QuoteErrorType } from '../../types';
 import { getWalletsForNewSwap } from '../../utils/swap';
 import { useFetchConfirmQuote } from '../useFetchConfirmQuote';
+import { useSwapMode } from '../useSwapMode';
 
 import {
   generateWarnings,
@@ -30,8 +31,9 @@ export function useHandleSwap(): ConfirmSwap {
     customDestination: customDestinationFromStore,
     confirmSwapData,
     resetAlerts,
-  } = useQuoteStore();
+  } = useQuoteStore()();
   const { manager } = useManager();
+  const { swapMode } = useSwapMode();
 
   const { slippage, customSlippage, disabledLiquiditySources } = useAppStore();
   const blockchains = useAppStore().blockchains();
@@ -143,14 +145,15 @@ export function useHandleSwap(): ConfirmSwap {
         disabledSwappersGroups: disabledLiquiditySources,
       };
 
-      const swap = calculatePendingSwap(
-        inputAmount.toString(),
-        data,
-        getWalletsForNewSwap(selectedWalletsForConfirmation ?? []),
-        swapSettings,
-        confirmSwapData.proceedAnyway,
-        { blockchains, tokens }
-      );
+      const swap = calculatePendingSwap({
+        inputAmount: inputAmount.toString(),
+        bestRoute: data,
+        wallets: getWalletsForNewSwap(selectedWalletsForConfirmation ?? []),
+        settings: swapSettings,
+        validateBalanceOrFee: confirmSwapData.proceedAnyway,
+        meta: { blockchains, tokens },
+        swapMode,
+      });
       await manager?.create(
         'swap',
         { swapDetails: swap },

widget/embedded/src/hooks/useUpdateSelectedWallets.ts/useUpdateSelectedWallets.ts

@@ -13,15 +13,19 @@ import { useQuoteStore } from '../../store/quote';
  * and trigger the wallet update method accordingly.
  */
 export function useUpdateSelectedWallets() {
-  const { fromToken, toToken, setCustomDestination } = useQuoteStore()();
+  const quoteStore = useQuoteStore()();
+  const { fromToken, toToken, setCustomDestination } = quoteStore;
   const {
     clearSelectedWallet,
     tryMatchWalletForBlockchain,
     isSelectedWalletStillRelevant,
   } = useAppStore();
 
   useEffect(() => {
-    const shouldUpdateSourceWallet = !isSelectedWalletStillRelevant('source');
+    const shouldUpdateSourceWallet = !isSelectedWalletStillRelevant(
+      'source',
+      quoteStore
+    );
     if (shouldUpdateSourceWallet) {
       clearSelectedWallet('source');
       if (fromToken) {
@@ -33,8 +37,10 @@ export function useUpdateSelectedWallets() {
   useEffect(() => {
     setCustomDestination(null);
 
-    const shouldUpdateDestinationWallet =
-      !isSelectedWalletStillRelevant('destination');
+    const shouldUpdateDestinationWallet = !isSelectedWalletStillRelevant(
+      'destination',
+      quoteStore
+    );
     if (shouldUpdateDestinationWallet) {
       clearSelectedWallet('destination');
       if (toToken) {

widget/embedded/src/pages/ConfirmSwapPage.tsx

@@ -61,6 +61,7 @@ export function ConfirmSwapPage() {
     quoteWarningsConfirmed,
     confirmSwapData,
     setInputAmount,
+    setConfirmSwapData,
   } = useQuoteStore()();
   const { disabledLiquiditySources } = useAppStore();
   const { isActiveTab } = useUiStore();
@@ -140,11 +141,9 @@ export function ConfirmSwapPage() {
   };
 
   const onConfirmBalanceWarning = async () => {
-    useQuoteStore.setState({
-      confirmSwapData: {
-        proceedAnyway: true,
-        quoteData: confirmSwapResult?.quoteData,
-      },
+    setConfirmSwapData({
+      proceedAnyway: true,
+      quoteData: confirmSwapResult?.quoteData,
     });
     await addNewSwap();
   };

widget/embedded/src/pages/DestinationWalletPage/DestinationWalletPage.tsx

@@ -34,8 +34,8 @@ import {
 const NUMBER_OF_WALLETS_TO_DISPLAY = 2;
 
 export function DestinationWalletPage() {
-  const { toBlockchain, customDestination, setCustomDestination } =
-    useQuoteStore();
+  const quoteStore = useQuoteStore()();
+  const { toBlockchain, customDestination, setCustomDestination } = quoteStore;
   const destinationWallet = useAppStore().selectedWallet('destination');
   const {
     setSelectedWallet,
@@ -68,7 +68,7 @@ export function DestinationWalletPage() {
       setShowCustomDestinationMessage(true);
     }
 
-    return checkAndClearCustomDestinationIfNeeded;
+    return () => checkAndClearCustomDestinationIfNeeded(quoteStore);
   }, []);
 
   if (!toBlockchain) {

widget/embedded/src/pages/Home.tsx

@@ -58,6 +58,7 @@ export function Home() {
     resetQuoteWallets,
     setQuoteWarningsConfirmed,
     updateQuotePartialState,
+    setConfirmSwapData,
   } = useQuoteStore()();
 
   const [isVisibleExpanded, setIsVisibleExpanded] = useState<boolean>(false);
@@ -218,11 +219,9 @@ export function Home() {
 
   const onConfirmBalanceWarning = () => {
     if (confirmSwapResult?.quoteData) {
-      useQuoteStore.setState({
-        confirmSwapData: {
-          proceedAnyway: true,
-          quoteData: confirmSwapResult?.quoteData,
-        },
+      setConfirmSwapData({
+        proceedAnyway: true,
+        quoteData: confirmSwapResult?.quoteData,
       });
       navigate(navigationRoutes.confirmSwap);
     }

widget/embedded/src/pages/RouteWalletsPage/RouteWalletsPage.helpers.ts

@@ -5,6 +5,6 @@ import { getQuoteChains } from '../../utils/wallets';
 export function getRouteBlockchains(quote: SelectedQuote): string[] {
   return getQuoteChains({ quote, filter: 'required' }).filter(
     // Since the source wallet is selected on the source page, we don't include it here.
-    (blockchain) => blockchain !== quote.swaps[0].from.blockchain
+    (blockchain) => blockchain !== quote.swaps[0]?.from.blockchain
   );
 }

widget/embedded/src/pages/RouteWalletsPage/RouteWalletsPage.tsx

@@ -58,7 +58,8 @@ export function SupportedWallets(props: SupportedWalletsPropTypes) {
 }
 
 export function RouteWalletsPage() {
-  const { selectedQuote } = useQuoteStore();
+  const quoteStore = useQuoteStore()();
+  const { selectedQuote, setConfirmSwapData } = quoteStore;
   const routeWallets = useAppStore().selectedWallet('route');
   const { connectedWallets, setSelectedWallet, suggestRouteWallets } =
     useAppStore();
@@ -78,7 +79,7 @@ export function RouteWalletsPage() {
     !!confirmSwapResult?.warnings?.balance?.messages;
 
   useEffect(() => {
-    suggestRouteWallets();
+    suggestRouteWallets(quoteStore);
   }, []);
 
   useEffect(() => {
@@ -122,11 +123,9 @@ export function RouteWalletsPage() {
 
   const onConfirmBalanceWarning = () => {
     if (confirmSwapResult?.quoteData) {
-      useQuoteStore.setState({
-        confirmSwapData: {
-          proceedAnyway: true,
-          quoteData: confirmSwapResult.quoteData,
-        },
+      setConfirmSwapData({
+        proceedAnyway: true,
+        quoteData: confirmSwapResult.quoteData,
       });
       navigateToConfirmSwapPage();
     }