Merge remote-tracking branch 'origin/main' into issue-#1611

README.md

@@ -271,6 +271,7 @@ The file `common.ts` with type [`AppConfig`](src/config/types.ts) contains impor
   - `priceChart`: use `tradingView` chart or `native` chart for token pair price history. You need to provide a backend with price history endpoint to support `native` view.
   - `useGradientBranding`: Flag to enable gradient styles for buttons.
   - `tradeCount`: Display the amount of trades in the explorer page.
+  - `currencyMenu`: Display the currency menu to switch between currencies.
 
 #### Gas token different than native token
 

e2e/utils/DebugDriver.ts

@@ -48,7 +48,7 @@ export const setupLocalStorage = async (page: Page, tenderlyRpc: string) => {
     // each value is stringified to match lsservice
     for (const [key, value] of Object.entries(storage)) {
       localStorage.setItem(
-        `carbon-ethereum-v1.2-${key}`,
+        `carbon-ethereum-v1.3-${key}`,
         JSON.stringify(value)
       );
     }

src/components/core/menu/mainMenu/MainMenuRightBurger/useBurgerMenuItems.tsx

@@ -7,6 +7,7 @@ import { ReactComponent as IconYoutube } from 'assets/logos/youtube.svg';
 import { ReactComponent as IconDiscord } from 'assets/logos/discord.svg';
 import { ReactComponent as IconTelegram } from 'assets/logos/telegram.svg';
 import { ReactComponent as IconV } from 'assets/icons/v.svg';
+import config from 'config';
 
 export type MenuItemType = {
   subMenu?: MenuType;
@@ -27,10 +28,6 @@ export const useBurgerMenuItems = () => {
   const menuMap = new Map<MenuType, Menu>();
 
   const mainItems: MenuItemType[] = [
-    {
-      subMenu: 'currency',
-      content: <CurrencyMenuItemContent />,
-    },
     {
       subMenu: 'resources',
       content: 'Resources',
@@ -101,6 +98,13 @@ export const useBurgerMenuItems = () => {
       ),
     },
   ];
+  if (config.ui.currencyMenu) {
+    mainItems.unshift({
+      subMenu: 'currency',
+      content: <CurrencyMenuItemContent />,
+    });
+  }
+  menuMap.set('main', { items: mainItems });
 
   const currencyItems = useMemo(
     (): MenuItemType[] => [
@@ -133,6 +137,12 @@ export const useBurgerMenuItems = () => {
     ],
     [availableCurrencies, selectedFiatCurrency, setSelectedFiatCurrency]
   );
+  if (config.ui.currencyMenu) {
+    menuMap.set('currency', {
+      items: currencyItems,
+      title: 'Currency',
+    });
+  }
 
   const resourcesItems: MenuItemType[] = [
     {
@@ -171,12 +181,6 @@ export const useBurgerMenuItems = () => {
       ),
     },
   ];
-
-  menuMap.set('main', { items: mainItems });
-  menuMap.set('currency', {
-    items: currencyItems,
-    title: 'Currency',
-  });
   menuMap.set('resources', {
     items: resourcesItems,
     title: 'Resources',

src/config/blast/common.ts

@@ -131,5 +131,6 @@ export const commonConfig: AppConfig = {
     priceChart: 'tradingView',
     useGradientBranding: true,
     tradeCount: false,
+    currencyMenu: false,
   },
 };

src/config/celo/common.ts

@@ -142,5 +142,6 @@ export const commonConfig: AppConfig = {
     priceChart: 'native',
     useGradientBranding: true,
     tradeCount: true,
+    currencyMenu: false,
   },
 };

src/config/configSchema.ts

@@ -108,5 +108,6 @@ export const AppConfigSchema = v.object({
     priceChart: v.union([v.literal('native'), v.literal('tradingView')]),
     useGradientBranding: v.optional(v.boolean()),
     tradeCount: v.optional(v.boolean()),
+    currencyMenu: v.optional(v.boolean()),
   }),
 });

src/config/ethereum/common.ts

@@ -217,5 +217,6 @@ export const commonConfig: AppConfig = {
     priceChart: 'native',
     useGradientBranding: true,
     tradeCount: false,
+    currencyMenu: true,
   },
 };

src/config/sei/common.ts

@@ -118,5 +118,6 @@ export const commonConfig: AppConfig = {
     priceChart: 'native',
     useGradientBranding: true,
     tradeCount: true,
+    currencyMenu: false,
   },
 };

src/services/localeStorage/index.ts

@@ -121,6 +121,20 @@ const migrations: Migration[] = [
       migrateAndRemoveItem({ prevFormattedKey, nextFormattedKey });
     },
   },
+  {
+    migrate: (prevFormattedKey) => {
+      const prefix = `carbon-${NETWORK}-v1.2-`;
+      if (prevFormattedKey === `${prefix}currentCurrency`) {
+        if (NETWORK !== 'ethereum') removeItem({ prevFormattedKey });
+      }
+      const isMatch = prevFormattedKey.startsWith(prefix);
+      if (!isMatch) return;
+      const key = prevFormattedKey.slice(prefix.length);
+      if (!key) return;
+      const nextFormattedKey = ['carbon', NETWORK, 'v1.3', key].join('-');
+      migrateAndRemoveItem({ prevFormattedKey, nextFormattedKey });
+    },
+  },
 ];
 
 export const lsService = new ManagedLocalStorage<LocalStorageSchema>(

src/utils/constants.ts

@@ -1,3 +1,3 @@
 export const APP_ID = 'carbon';
-export const APP_VERSION = 'v1.2';
+export const APP_VERSION = 'v1.3';
 export const NETWORK = import.meta.env.VITE_NETWORK || 'ethereum';