@rango-dev/widget-embedded 0.17.1-next.9 → 0.19.0

package/src/pages/SwapDetailsPage.tsx

@@ -6,7 +6,7 @@ import { SwapDetails } from '../components/SwapDetails';
 import { SwapDetailsPlaceholder } from '../components/SwapDetails/SwapDetails.Placeholder';
 import { navigationRoutes } from '../constants/navigationRoutes';
 import { useNavigateBack } from '../hooks/useNavigateBack';
-import { useAppStore } from '../store/AppStore';
+import { useMetaStore } from '../store/meta';
 import { useUiStore } from '../store/ui';
 import { getPendingSwaps } from '../utils/queue';
 
@@ -16,9 +16,9 @@ export function SwapDetailsPage() {
   const pendingSwaps = getPendingSwaps(manager);
   const requestId = useUiStore.use.selectedSwapRequestId();
   const { navigateBackFrom } = useNavigateBack();
-  const { fetchStatus: fetchMetaStatus } = useAppStore();
+  const { loadingStatus } = useMetaStore();
 
-  const showSkeleton = loading || fetchMetaStatus === 'loading';
+  const showSkeleton = loading || loadingStatus === 'loading';
 
   const selectedSwap = pendingSwaps.find(
     ({ swap }) => swap.requestId === requestId

package/src/pages/ThemePage.tsx

@@ -72,7 +72,7 @@ export function ThemePage() {
   return (
     <Layout
       header={{
-        onBack: () => navigateBackFrom(navigationRoutes.settings),
+        onBack: navigateBackFrom.bind(null, navigationRoutes.settings),
         title: i18n.t('Theme'),
       }}>
       <SettingsContainer>

package/src/pages/WalletsPage.tsx

@@ -1,3 +1,4 @@
+import type { WidgetConfig } from '../types';
 import type { WalletType } from '@rango-dev/wallets-shared';
 
 import { i18n } from '@lingui/core';
@@ -9,9 +10,15 @@ import { WalletModal } from '../components/WalletModal';
 import { navigationRoutes } from '../constants/navigationRoutes';
 import { useNavigateBack } from '../hooks/useNavigateBack';
 import { useWalletList } from '../hooks/useWalletList';
-import { useAppStore } from '../store/AppStore';
+import { useMetaStore } from '../store/meta';
 import { getContainer } from '../utils/common';
 
+interface PropTypes {
+  supportedWallets: WidgetConfig['wallets'];
+  multiWallets: boolean;
+  config?: WidgetConfig;
+}
+
 const ListContainer = styled('div', {
   display: 'grid',
   gap: '$10',
@@ -28,8 +35,7 @@ const Container = styled('div', {
 export const TIME_TO_CLOSE_MODAL = 3_000;
 export const TIME_TO_IGNORE_MODAL = 300;
 
-export function WalletsPage() {
-  const { config, fetchStatus: fetchMetaStatus } = useAppStore();
+export function WalletsPage({ config }: PropTypes) {
   const { navigateBackFrom } = useNavigateBack();
   const [openModal, setOpenModal] = useState(false);
   const [selectedWalletType, setSelectedWalletType] = useState<WalletType>('');
@@ -53,6 +59,7 @@ export function WalletsPage() {
     },
   });
 
+  const loadingMetaStatus = useMetaStore.use.loadingStatus();
   const selectedWallet = list.find(
     (wallet) => wallet.type === selectedWalletType
   );
@@ -64,7 +71,7 @@ export function WalletsPage() {
     <Layout
       header={{
         title: i18n.t('Connect Wallets'),
-        onBack: () => navigateBackFrom(navigationRoutes.wallets),
+        onBack: navigateBackFrom.bind(null, navigationRoutes.wallets),
       }}>
       <Container>
         <Typography variant="title" size="xmedium" align="center">
@@ -81,7 +88,7 @@ export function WalletsPage() {
                   onClick={(type) => {
                     void handleClick(type);
                   }}
-                  isLoading={fetchMetaStatus === 'loading'}
+                  isLoading={loadingMetaStatus === 'loading'}
                 />
               </Fragment>
             );

package/src/store/app.ts

@@ -1,27 +1,15 @@
 import type { ConfigSlice } from './slices/config';
 import type { DataSlice } from './slices/data';
-import type { WidgetConfig } from '../types';
-import type { StateCreator } from 'zustand';
 
 import { create } from 'zustand';
 
+import createSelectors from './selectors';
 import { createConfigSlice } from './slices/config';
 import { createDataSlice } from './slices/data';
 
-export type StateCreatorWithInitialData<
-  T extends Partial<WidgetConfig>,
-  R extends Record<string, unknown>,
-  V extends Record<string, unknown>
-> = (
-  initialData: T | undefined,
-  ...rest: Parameters<StateCreator<R, [], [], V>>
-) => ReturnType<StateCreator<R, [], [], V>>;
+const store = create<DataSlice & ConfigSlice>()((...a) => ({
+  ...createDataSlice(...a),
+  ...createConfigSlice(...a),
+}));
 
-export type AppStoreState = DataSlice & ConfigSlice;
-
-export function createAppStore(initialData?: WidgetConfig) {
-  return create<AppStoreState>()((...a) => ({
-    ...createDataSlice(...a),
-    ...createConfigSlice(initialData, ...a),
-  }));
-}
+export const useAppStore = createSelectors(store);

package/src/store/{quote.ts → bestRoute.ts}

@@ -1,12 +1,7 @@
 import type { TokenWithBalance } from '../components/TokenList';
 import type { Wallet } from '../types';
 import type { PendingSwap } from '@rango-dev/queue-manager-rango-preset/dist/shared';
-import type {
-  BestRouteResponse,
-  BlockchainMeta,
-  MetaResponse,
-  Token,
-} from 'rango-sdk';
+import type { BestRouteResponse, BlockchainMeta, Token } from 'rango-sdk';
 
 import BigNumber from 'bignumber.js';
 import { create } from 'zustand';
@@ -14,24 +9,21 @@ import { subscribeWithSelector } from 'zustand/middleware';
 
 import { ZERO } from '../constants/numbers';
 import { isPositiveNumber } from '../utils/numbers';
-import { createRetryQuote, getQuoteToTokenUsdPrice } from '../utils/quote';
+import {
+  createRetryRoute,
+  getBestRouteToTokenUsdPrice,
+} from '../utils/routing';
 import { calcOutputUsdValue } from '../utils/swap';
 
+import { useMetaStore } from './meta';
 import createSelectors from './selectors';
 
-export const getUsdValue = (
-  token: Token | null,
-  amount: string
-): BigNumber | null =>
+const getUsdValue = (token: Token | null, amount: string): BigNumber | null =>
   token?.usdPrice
     ? new BigNumber(amount || ZERO).multipliedBy(token?.usdPrice || 0)
     : null;
 
-export type Meta = Pick<MetaResponse, 'blockchains' | 'tokens'>;
-
-export type SetTokenParams = { token: Token; meta: Meta } | { token: null };
-
-export interface QuoteState {
+export interface RouteState {
   fromBlockchain: BlockchainMeta | null;
   toBlockchain: BlockchainMeta | null;
   inputAmount: string;
@@ -40,32 +32,30 @@ export interface QuoteState {
   outputUsdValue: BigNumber | null;
   fromToken: TokenWithBalance | null;
   toToken: TokenWithBalance | null;
-  quoteWalletsConfirmed: boolean;
+  routeWalletsConfirmed: boolean;
   selectedWallets: Wallet[];
-  quoteWarningsConfirmed: boolean;
-  resetQuote: () => void;
+  resetRoute: () => void;
   resetToBlockchain: () => void;
   resetFromBlockchain: () => void;
   setFromBlockchain: (chain: BlockchainMeta | null) => void;
   setToBlockchain: (chian: BlockchainMeta | null) => void;
 
-  setFromToken: (params: SetTokenParams) => void;
-  setToToken: (params: SetTokenParams) => void;
+  setFromToken: (token: Token | null) => void;
+  setToToken: (token: Token | null) => void;
   setInputAmount: (amount: string) => void;
-  quote: BestRouteResponse | null;
-  setQuote: (quote: BestRouteResponse | null) => void;
-  retry: (pendingSwap: PendingSwap, meta: Meta) => void;
+  bestRoute: BestRouteResponse | null;
+  setRoute: (bestRoute: BestRouteResponse | null) => void;
+  retry: (pendingSwap: PendingSwap) => void;
   switchFromAndTo: () => void;
-  setQuoteWalletConfirmed: (flag: boolean) => void;
+  setRouteWalletConfirmed: (flag: boolean) => void;
   setSelectedWallets: (wallets: Wallet[]) => void;
   customDestination: string;
   setCustomDestination: (address: string) => void;
-  resetQuoteWallets: () => void;
-  setQuoteWarningsConfirmed: (flag: boolean) => void;
+  resetRouteWallets: () => void;
 }
 
-export const useQuoteStore = createSelectors(
-  create<QuoteState>()(
+export const useBestRouteStore = createSelectors(
+  create<RouteState>()(
     subscribeWithSelector((set) => ({
       fromBlockchain: null,
       fromToken: null,
@@ -75,38 +65,37 @@ export const useQuoteStore = createSelectors(
       outputUsdValue: new BigNumber(0),
       toBlockchain: null,
       toToken: null,
-      quote: null,
-      quoteWalletsConfirmed: false,
+      bestRoute: null,
+      routeWalletsConfirmed: false,
       selectedWallets: [],
       customDestination: '',
-      quoteWarningsConfirmed: false,
-      setQuote: (quote) =>
+      setRoute: (bestRoute) =>
         set((state) => {
           let outputAmount: BigNumber | null = null;
           let outputUsdValue: BigNumber = ZERO;
           if (!isPositiveNumber(state.inputAmount)) {
             return {};
           }
-          if (!!quote) {
-            outputAmount = !!quote.result?.outputAmount
-              ? new BigNumber(quote.result?.outputAmount)
+          if (!!bestRoute) {
+            outputAmount = !!bestRoute.result?.outputAmount
+              ? new BigNumber(bestRoute.result?.outputAmount)
               : null;
             outputUsdValue = calcOutputUsdValue(
-              quote.result?.outputAmount,
-              getQuoteToTokenUsdPrice(quote) || state.toToken?.usdPrice
+              bestRoute.result?.outputAmount,
+              getBestRouteToTokenUsdPrice(bestRoute) || state.toToken?.usdPrice
             );
           }
           return {
-            quote: quote,
-            ...(!!quote && {
+            bestRoute,
+            ...(!!bestRoute && {
               outputAmount,
               outputUsdValue,
             }),
           };
         }),
-      resetQuote: () =>
+      resetRoute: () =>
         set(() => ({
-          quote: null,
+          bestRoute: null,
           outputAmount: null,
           outputUsdValue: new BigNumber(0),
         })),
@@ -119,7 +108,7 @@ export const useQuoteStore = createSelectors(
           return {
             fromBlockchain: chain,
             ...(state.fromToken && {
-              quote: null,
+              bestRoute: null,
               fromToken: null,
               outputAmount: null,
               outputUsdValue: null,
@@ -127,17 +116,18 @@ export const useQuoteStore = createSelectors(
           };
         });
       },
-      setFromToken: (params) => {
+      setFromToken: (token) => {
+        const { blockchains } = useMetaStore.getState().meta;
         return set((state) => ({
-          fromToken: params.token,
-          ...(params.token && {
+          fromToken: token,
+          ...(token && {
             fromBlockchain:
-              params.meta.blockchains.find(
-                (blockchain) => blockchain.name === params.token.blockchain
+              blockchains.find(
+                (blockchain) => blockchain.name === token.blockchain
               ) ?? null,
           }),
           ...(!!state.inputAmount && {
-            inputUsdValue: getUsdValue(params.token, state.inputAmount),
+            inputUsdValue: getUsdValue(token, state.inputAmount),
           }),
         }));
       },
@@ -150,7 +140,7 @@ export const useQuoteStore = createSelectors(
           return {
             toBlockchain: chain,
             ...(state.toToken && {
-              quote: null,
+              bestRoute: null,
               toToken: null,
               outputAmount: null,
               outputUsdValue: null,
@@ -158,13 +148,14 @@ export const useQuoteStore = createSelectors(
           };
         });
       },
-      setToToken: (params) => {
+      setToToken: (token) => {
+        const { blockchains } = useMetaStore.getState().meta;
         return set(() => ({
-          toToken: params.token,
-          ...(params.token && {
+          toToken: token,
+          ...(token && {
             toBlockchain:
-              params.meta.blockchains.find(
-                (blockchain) => blockchain.name === params.token.blockchain
+              blockchains.find(
+                (blockchain) => blockchain.name === token.blockchain
               ) ?? null,
           }),
         }));
@@ -175,22 +166,24 @@ export const useQuoteStore = createSelectors(
           ...(!amount && {
             outputAmount: new BigNumber(0),
             outputUsdValue: new BigNumber(0),
-            quote: null,
+            bestRoute: null,
           }),
           ...(!!state.fromToken && {
             inputUsdValue: getUsdValue(state.fromToken, amount),
           }),
         }));
       },
-      retry: (pendingSwap, meta) => {
-        const { tokens, blockchains } = meta;
+      retry: (pendingSwap) => {
+        const { tokens, blockchains } = useMetaStore.getState().meta;
+
         const {
           fromBlockchain,
           fromToken,
           toBlockchain,
           toToken,
           inputAmount,
-        } = createRetryQuote(pendingSwap, blockchains, tokens);
+        } = createRetryRoute(pendingSwap, blockchains, tokens);
+
         set({
           fromBlockchain,
           fromToken,
@@ -200,7 +193,7 @@ export const useQuoteStore = createSelectors(
           outputUsdValue: new BigNumber(0),
           toBlockchain,
           toToken,
-          quote: null,
+          bestRoute: null,
         });
       },
       switchFromAndTo: () =>
@@ -215,13 +208,14 @@ export const useQuoteStore = createSelectors(
             state.outputAmount?.toString() || ''
           ),
         })),
+
       resetFromBlockchain: () =>
         set(() => ({
           fromToken: null,
           fromBlockchain: null,
           outputAmount: null,
           outputUsdValue: null,
-          quote: null,
+          bestRoute: null,
         })),
       resetToBlockchain: () =>
         set(() => ({
@@ -229,22 +223,20 @@ export const useQuoteStore = createSelectors(
           toBlockchain: null,
           outputAmount: null,
           outputUsdValue: null,
-          quote: null,
+          bestRoute: null,
         })),
-      setQuoteWalletConfirmed: (flag) =>
+      setRouteWalletConfirmed: (flag) =>
         set({
-          quoteWalletsConfirmed: flag,
+          routeWalletsConfirmed: flag,
         }),
       setSelectedWallets: (wallets) => set({ selectedWallets: wallets }),
       setCustomDestination: (address) => set({ customDestination: address }),
-      resetQuoteWallets: () =>
+      resetRouteWallets: () =>
         set({
-          quoteWalletsConfirmed: false,
+          routeWalletsConfirmed: false,
           selectedWallets: [],
           customDestination: '',
         }),
-      setQuoteWarningsConfirmed: (flag) =>
-        set({ quoteWarningsConfirmed: flag }),
     }))
   )
 );

package/src/store/meta.ts

@@ -0,0 +1,39 @@
+import type { TokenWithBalance } from '../components/TokenList';
+import type { MetaResponse } from 'rango-sdk';
+
+import { create } from 'zustand';
+
+import { useAppStore } from './app';
+import createSelectors from './selectors';
+
+export type LoadingStatus = 'loading' | 'success' | 'failed';
+
+export interface MetaState {
+  meta: MetaResponse & { tokens: TokenWithBalance[] };
+  loadingStatus: LoadingStatus;
+  fetchMeta: () => Promise<void>;
+}
+
+export const useMetaStore = createSelectors(
+  create<MetaState>()((set) => ({
+    meta: { blockchains: [], popularTokens: [], swappers: [], tokens: [] },
+    loadingStatus: 'loading',
+    fetchMeta: async () => {
+      try {
+        await useAppStore.getState().fetch();
+
+        const state = useAppStore.getState();
+        const response: MetaResponse = {
+          blockchains: state.blockchains(),
+          tokens: state.tokens(),
+          popularTokens: state._popularTokens,
+          swappers: state._swappers,
+        };
+
+        set({ meta: response, loadingStatus: 'success' });
+      } catch (error) {
+        set({ loadingStatus: 'failed' });
+      }
+    },
+  }))
+);

package/src/store/settings.ts

@@ -1,5 +1,3 @@
-import type { SwapperMeta } from 'rango-sdk';
-
 import { type Language } from '@rango-dev/ui';
 import { create } from 'zustand';
 import { persist, subscribeWithSelector } from 'zustand/middleware';
@@ -9,6 +7,7 @@ import { DEFAULT_LANGUAGE } from '../constants/languages';
 import { DEFAULT_SLIPPAGE } from '../constants/swapSettings';
 import { removeDuplicateFrom } from '../utils/common';
 
+import { useMetaStore } from './meta';
 import createSelectors from './selectors';
 
 export type ThemeMode = 'auto' | 'dark' | 'light';
@@ -32,10 +31,7 @@ export interface SettingsState {
   toggleLiquiditySource: (name: string) => void;
   setTheme: (theme: ThemeMode) => void;
   setLanguage: (language: Language) => void;
-  toggleAllLiquiditySources: (
-    swappers: SwapperMeta[],
-    shouldReset?: boolean
-  ) => void;
+  toggleAllLiquiditySources: (shouldReset?: boolean) => void;
   setAffiliateRef: (affiliateRef: string | null) => void;
   setAffiliatePercent: (affiliatePercent: number | null) => void;
   setAffiliateWallets: (
@@ -106,11 +102,12 @@ export const useSettingsStore = createSelectors(
           set(() => ({
             affiliateWallets,
           })),
-        toggleAllLiquiditySources: (swappers, shouldReset) =>
+        toggleAllLiquiditySources: (shouldReset?: boolean) =>
           set((state) => {
             if (shouldReset) {
               return { disabledLiquiditySources: [] };
             }
+            const { swappers } = useMetaStore.getState().meta;
             const swappersGroup = removeDuplicateFrom(
               swappers.map((swapper) => swapper.swapperGroup)
             );

package/src/store/slices/config.ts

@@ -1,11 +1,7 @@
 import type { WidgetConfig } from '../../types';
-import type { StateCreatorWithInitialData } from '../app';
+import type { StateCreator } from 'zustand';
 
-export const DEFAULT_CONFIG: WidgetConfig = {
-  apiKey: '',
-  multiWallets: true,
-  enableNewLiquiditySources: true,
-};
+const initConfig: WidgetConfig = { apiKey: '' };
 
 export type ConfigSlice = {
   config: WidgetConfig;
@@ -13,24 +9,18 @@ export type ConfigSlice = {
   updateConfig: (config: WidgetConfig) => void;
 };
 
-export const createConfigSlice: StateCreatorWithInitialData<
-  WidgetConfig,
-  ConfigSlice,
-  ConfigSlice
-> = (initialData, set, get) => {
-  return {
-    config: { ...DEFAULT_CONFIG, ...initialData },
+export const createConfigSlice: StateCreator<ConfigSlice> = (set, get) => ({
+  config: initConfig,
 
-    // Actions
-    updateConfig: (nextConfig: WidgetConfig) => {
-      const currentConfig = get().config;
+  // Actions
+  updateConfig: (nextConfig: WidgetConfig) => {
+    const currentConfig = get().config;
 
-      set({
-        config: {
-          ...currentConfig,
-          ...nextConfig,
-        },
-      });
-    },
-  };
-};
+    set({
+      config: {
+        ...currentConfig,
+        ...nextConfig,
+      },
+    });
+  },
+});

package/src/store/slices/data.ts

@@ -6,7 +6,6 @@ import type { StateCreator } from 'zustand';
 
 import { httpService as sdk } from '../../services/httpService';
 import { containsText } from '../../utils/common';
-import { sortLiquiditySourcesByGroupTitle } from '../../utils/settings';
 import { tokensAreEqual } from '../../utils/wallets';
 
 type BlockchainOptions = {
@@ -19,16 +18,15 @@ type TokenOptions = {
   blockchain?: string;
   searchFor?: string;
 };
-export type FetchStatus = 'loading' | 'success' | 'failed';
+
 export interface DataSlice {
   _blockchains: BlockchainMeta[];
   _tokens: Token[];
   _popularTokens: Token[];
   _swappers: SwapperMeta[];
-  fetchStatus: FetchStatus;
+
   blockchains: (options?: BlockchainOptions) => BlockchainMeta[];
   tokens: (options?: TokenOptions) => Token[];
-  swappers: () => SwapperMeta[];
   isTokenPinned: (token: Token) => boolean;
 
   fetch: () => Promise<void>;
@@ -45,7 +43,7 @@ export const createDataSlice: StateCreator<
   _tokens: [],
   _popularTokens: [],
   _swappers: [],
-  fetchStatus: 'loading',
+
   // Selectors
   blockchains: (options) => {
     const blockchainsFromState = get()._blockchains;
@@ -165,74 +163,41 @@ export const createDataSlice: StateCreator<
     );
     return pinned;
   },
-  swappers: () => {
-    const {
-      config: { enableNewLiquiditySources, liquiditySources },
-    } = get();
-
-    /*
-     * If the enableNewLiquiditySources flag is set to true, we return all swappers that are not included in the config.
-     * Otherwise, we return all swappers that are included in the config.
-     */
-    const swappers = get()._swappers.filter((swapper) => {
-      const swapperGroupIncludedInLiquiditySources = liquiditySources?.includes(
-        swapper.swapperGroup
-      );
-
-      const shouldExcludeLiquiditySources =
-        enableNewLiquiditySources ||
-        !liquiditySources ||
-        liquiditySources.length === 0;
-
-      return shouldExcludeLiquiditySources
-        ? !swapperGroupIncludedInLiquiditySources
-        : swapperGroupIncludedInLiquiditySources;
-    });
-
-    const sortedSwappers = swappers.sort(sortLiquiditySourcesByGroupTitle);
 
-    return sortedSwappers;
-  },
   // Actions
   fetch: async () => {
-    try {
-      const response = await sdk().getAllMetadata();
+    const response = await sdk().getAllMetadata();
 
-      set({ fetchStatus: 'success' });
-      const blockchains: BlockchainMeta[] = [];
-      const tokens: Token[] = [];
-      const popularTokens: Token[] = response.popularTokens;
-      const swappers: SwapperMeta[] = response.swappers;
+    const blockchains: BlockchainMeta[] = [];
+    const tokens: Token[] = [];
+    const popularTokens: Token[] = response.popularTokens;
+    const swappers: SwapperMeta[] = response.swappers;
 
-      const blockchainsWithAtLeastOneToken = new Set();
+    const blockchainsWithAtLeastOneToken = new Set();
 
-      response.tokens.forEach((token) => {
-        blockchainsWithAtLeastOneToken.add(token.blockchain);
+    response.tokens.forEach((token) => {
+      blockchainsWithAtLeastOneToken.add(token.blockchain);
 
-        tokens.push(token);
-      });
+      tokens.push(token);
+    });
 
-      response.blockchains.forEach((blockchain) => {
-        if (
-          blockchain.enabled &&
-          blockchainsWithAtLeastOneToken.has(blockchain.name)
-        ) {
-          blockchains.push(blockchain);
-        }
-      });
+    response.blockchains.forEach((blockchain) => {
+      if (
+        blockchain.enabled &&
+        blockchainsWithAtLeastOneToken.has(blockchain.name)
+      ) {
+        blockchains.push(blockchain);
+      }
+    });
 
-      // Sort
-      blockchains.sort((a, b) => a.sort - b.sort);
+    // Sort
+    blockchains.sort((a, b) => a.sort - b.sort);
 
-      set({
-        _blockchains: blockchains,
-        _tokens: tokens,
-        _popularTokens: popularTokens,
-        _swappers: swappers,
-      });
-    } catch (error) {
-      set({ fetchStatus: 'failed' });
-      throw error;
-    }
+    set({
+      _blockchains: blockchains,
+      _tokens: tokens,
+      _popularTokens: popularTokens,
+      _swappers: swappers,
+    });
   },
 });