Merge branch 'develop' into feat/money-market

DistributedCollective · Oct 5, 2024 · 1009026 · 1009026
2 parents 8664554 + 68c3367
commit 1009026
Show file tree

Hide file tree

Showing 54 changed files with 630 additions and 995 deletions.
diff --git a/apps/frontend/CHANGELOG.md b/apps/frontend/CHANGELOG.md
@@ -1,5 +1,28 @@
 # frontend
 
+## 1.1.22
+
+### Patch Changes
+
+- ef2f1abe: SOV-4457: rebrand SAT token
+- c20bcb3b: SOV-4443: rune pool page update
+- b41a6af1: SOV-4461: Remove POWA page
+- 88463a86: SOV-4444: Rune pools convert updates
+- 97329130: SOV-4467: Spice Leaderboard adjustments for Season 3
+- Updated dependencies [ef2f1abe]
+- Updated dependencies [88463a86]
+  - @sovryn/contracts@1.2.1
+  - @sovryn/sdk@2.0.1
+  - @sovryn/ui@1.0.31
+
+## 1.1.21
+
+### Patch Changes
+
+- 5f000110: SOV-4453: Fixed issue with Portfolio page crashing on RSK chain
+- Updated dependencies [5f000110]
+  - @sovryn/sdex@0.3.14
+
 ## 1.1.20
 
 ### Patch Changes

diff --git a/apps/frontend/package.json b/apps/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.1.20",
+  "version": "1.1.22",
   "homepage": ".",
   "private": true,
   "dependencies": {

diff --git a/apps/frontend/src/app/3_organisms/Header/Header.constants.tsx b/apps/frontend/src/app/3_organisms/Header/Header.constants.tsx
@@ -59,11 +59,6 @@ export const menuItemsMapping: MenuItem[] = [
         label: t(translations.header.nav.earn.subMenu.stakingDescription),
         url: '/earn/staking',
       },
-      {
-        text: t(translations.leaderboardPage.headerLink),
-        label: t(translations.leaderboardPage.headerDescription),
-        url: '/powa',
-      },
     ],
   },
   {

diff --git a/apps/frontend/src/app/3_organisms/Header/Header.tsx b/apps/frontend/src/app/3_organisms/Header/Header.tsx
@@ -74,7 +74,7 @@ export const Header: FC = () => {
                 text={t(translations.header.nav.spicePoints)}
                 style={ButtonStyle.primary}
                 className="bg-[#24BFB74D]/[0.3] border-[#24BFB74D]/[0.3] hover:bg-[#24BFB74D]"
-                onClick={() => navigate('/claim-lp')}
+                onClick={() => navigate('/bob-lp-points')}
               />
             )}
           </ol>

diff --git a/apps/frontend/src/app/5_pages/ConvertPage/ConvertPage.constants.ts b/apps/frontend/src/app/5_pages/ConvertPage/ConvertPage.constants.ts
@@ -5,6 +5,7 @@ import { SmartRouter, smartRoutes } from '@sovryn/sdk';
 import { RSK_CHAIN_ID } from '../../../config/chains';
 
 import { COMMON_SYMBOLS } from '../../../utils/asset';
+import { CategoryType } from './ConvertPage.types';
 
 export const FIXED_RATE_ROUTES = ['MyntBasset', 'MyntFixedRate'];
 
@@ -48,3 +49,10 @@ export const DEFAULT_SWAP_ENTRIES: Partial<Record<ChainIds, string>> = {
   [ChainIds.BOB_TESTNET]: COMMON_SYMBOLS.ETH,
   [ChainIds.SEPOLIA]: COMMON_SYMBOLS.ETH,
 };
+
+export const CATEGORY_TOKENS: Record<CategoryType, string[]> = {
+  [CategoryType.Stablecoins]: SMART_ROUTER_STABLECOINS,
+  [CategoryType.BTC]: [COMMON_SYMBOLS.BTC],
+  [CategoryType.Runes]: ['POWA'],
+  [CategoryType.All]: [],
+};