From 5f000110943ab6dd85f0314cec609fe18370ce71 Mon Sep 17 00:00:00 2001
From: Pietro <74987028+pietro-maximoff@users.noreply.github.com>
Date: Fri, 13 Sep 2024 13:55:54 +0200
Subject: [PATCH 1/8] Portfolio page in D2 on RSK fix (#1002)

* chore: fix issue with decimalish value

* chore: add support for the RSK chain in the CHAIN_SPECS object

* Create real-ghosts-judge.md

* chore: update changeset

---------

Co-authored-by: soulBit <its.soulBit@gmail.com>
---
 .changeset/real-ghosts-judge.md               |  6 +++
 .../src/hooks/useGetNativeTokenPrice.ts       | 11 ++---
 packages/sdex/src/constants.ts                | 46 +++++++++++++++++++
 3 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/real-ghosts-judge.md

diff --git a/.changeset/real-ghosts-judge.md b/.changeset/real-ghosts-judge.md
new file mode 100644
index 000000000..481beea44
--- /dev/null
+++ b/.changeset/real-ghosts-judge.md
@@ -0,0 +1,6 @@
+---
+"frontend": patch
+"@sovryn/sdex": patch
+---
+
+SOV-4453: Fixed issue with Portfolio page crashing on RSK chain
diff --git a/apps/frontend/src/hooks/useGetNativeTokenPrice.ts b/apps/frontend/src/hooks/useGetNativeTokenPrice.ts
index b7d9e78b0..49ba66e49 100644
--- a/apps/frontend/src/hooks/useGetNativeTokenPrice.ts
+++ b/apps/frontend/src/hooks/useGetNativeTokenPrice.ts
@@ -26,8 +26,7 @@ export const useGetNativeTokenPrice = () => {
       });
 
       const price = data?.data[0]?.usdPrice as string;
-
-      return price;
+      return price ?? '0';
     },
     [currentChainId],
   );
@@ -37,10 +36,10 @@ export const useGetNativeTokenPrice = () => {
     toWei(1).toString(),
   );
 
-  const price = useMemo(
-    () => (isRskChain(currentChainId) ? rBTCPrice : ethPrice),
-    [currentChainId, ethPrice, rBTCPrice],
-  );
+  const price = useMemo(() => {
+    const nativePrice = isRskChain(currentChainId) ? rBTCPrice : ethPrice;
+    return nativePrice || '0';
+  }, [currentChainId, ethPrice, rBTCPrice]);
 
   const nativeToken = useMemo(
     () => (isRskChain(currentChainId) ? BITCOIN : ETH),
diff --git a/packages/sdex/src/constants.ts b/packages/sdex/src/constants.ts
index c31b5318e..4810d4fbb 100644
--- a/packages/sdex/src/constants.ts
+++ b/packages/sdex/src/constants.ts
@@ -136,12 +136,58 @@ const LOCAL_FORK_CHAIN: ChainSpec = Object.assign({}, SEPOLIA_CHAIN, {
   displayName: 'Local Fork',
 });
 
+const RSK_MAINNET: ChainSpec = {
+  nodeUrl: 'https://public-node.rsk.co',
+  addrs: {
+    dex: '',
+    query: '',
+    impact: '',
+    router: '',
+    routerBypass: '',
+  },
+  poolIndex: 0,
+  isTestNet: false,
+  chainId: '0x1e', // 30 in decimal
+  gridSize: 0,
+  proxyPaths: {
+    cold: 0,
+    long: 0,
+    liq: 0,
+    dfltColdSwap: true,
+  },
+  displayName: 'RSK Mainnet',
+};
+
+const RSK_TESTNET: ChainSpec = {
+  nodeUrl: 'https://public-node.testnet.rsk.co',
+  addrs: {
+    dex: '',
+    query: '',
+    impact: '',
+    router: '',
+    routerBypass: '',
+  },
+  poolIndex: 0,
+  isTestNet: true,
+  chainId: '0x1f', // 31 in decimal
+  gridSize: 0,
+  proxyPaths: {
+    cold: 0,
+    long: 0,
+    liq: 0,
+  },
+  blockExplorer: 'https://explorer.testnet.rsk.co',
+  displayName: 'RSK Testnet',
+};
+
 export const CHAIN_SPECS: { [chainId: string]: ChainSpec } = {
   '0xed88': BOB_CHAIN,
   '0xc576d': BOB_TESTNET_CHAIN,
   '0x7a69': LOCAL_FORK_CHAIN,
   '0xaa36a7': SEPOLIA_CHAIN,
   '0x1b669': TENDERLY_FORK,
+  '0x1e': RSK_MAINNET,
+  '0x1f': RSK_TESTNET,
   sepolia: SEPOLIA_CHAIN,
   local: LOCAL_FORK_CHAIN,
   bob: BOB_CHAIN,

From 04f2b6f46fae8c5e94ad288cc0cec40684d77c03 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2024 12:59:25 +0100
Subject: [PATCH 2/8] Version Packages (#1005)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/real-ghosts-judge.md | 6 ------
 apps/frontend/CHANGELOG.md      | 8 ++++++++
 apps/frontend/package.json      | 2 +-
 packages/sdex/CHANGELOG.md      | 6 ++++++
 packages/sdex/package.json      | 2 +-
 5 files changed, 16 insertions(+), 8 deletions(-)
 delete mode 100644 .changeset/real-ghosts-judge.md

diff --git a/.changeset/real-ghosts-judge.md b/.changeset/real-ghosts-judge.md
deleted file mode 100644
index 481beea44..000000000
--- a/.changeset/real-ghosts-judge.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"frontend": patch
-"@sovryn/sdex": patch
----
-
-SOV-4453: Fixed issue with Portfolio page crashing on RSK chain
diff --git a/apps/frontend/CHANGELOG.md b/apps/frontend/CHANGELOG.md
index d66c33508..0c1fb7857 100644
--- a/apps/frontend/CHANGELOG.md
+++ b/apps/frontend/CHANGELOG.md
@@ -1,5 +1,13 @@
 # frontend
 
+## 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
index 2d59dbed8..1c39a248a 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.1.20",
+  "version": "1.1.21",
   "homepage": ".",
   "private": true,
   "dependencies": {
diff --git a/packages/sdex/CHANGELOG.md b/packages/sdex/CHANGELOG.md
index 8c3371b52..7dbd70102 100644
--- a/packages/sdex/CHANGELOG.md
+++ b/packages/sdex/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sovryn/sdex
 
+## 0.3.14
+
+### Patch Changes
+
+- 5f000110: SOV-4453: Fixed issue with Portfolio page crashing on RSK chain
+
 ## 0.3.13
 
 ### Patch Changes
diff --git a/packages/sdex/package.json b/packages/sdex/package.json
index 391833f55..27f896cc0 100644
--- a/packages/sdex/package.json
+++ b/packages/sdex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sovryn/sdex",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "description": "🛠🐊🛠 An SDK for building applications on top of Sovryn dex",
   "repository": "https://github.com/DistributedCollective/sovryn-dapp.git",
   "license": "MIT",

From ef2f1abee5f4240ec75c904d219667be3271815b Mon Sep 17 00:00:00 2001
From: Victor Creed <69458664+creed-victor@users.noreply.github.com>
Date: Mon, 16 Sep 2024 15:22:45 +0300
Subject: [PATCH 3/8] SOV-4457: rebrand SAT token (#1006)

* feat: rebrand SAT token

* chore: remove $ sign
---
 .changeset/green-forks-rule.md                            | 8 ++++++++
 .../AmbientMarketMaking/utils/pools/bobMainnet.ts         | 4 ++--
 packages/contracts/src/contracts/assets/bob.ts            | 2 +-
 .../sdk/src/swaps/smart-router/utils/ambient-utils.ts     | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/green-forks-rule.md

diff --git a/.changeset/green-forks-rule.md b/.changeset/green-forks-rule.md
new file mode 100644
index 000000000..3cb6e25a7
--- /dev/null
+++ b/.changeset/green-forks-rule.md
@@ -0,0 +1,8 @@
+---
+'frontend': patch
+'@sovryn/contracts': patch
+'@sovryn/sdk': patch
+---
+
+SOV-4457: rebrand SAT token
+
diff --git a/apps/frontend/src/app/5_pages/MarketMakingPage/components/AmbientMarketMaking/utils/pools/bobMainnet.ts b/apps/frontend/src/app/5_pages/MarketMakingPage/components/AmbientMarketMaking/utils/pools/bobMainnet.ts
index b1df62569..d8419ad7a 100644
--- a/apps/frontend/src/app/5_pages/MarketMakingPage/components/AmbientMarketMaking/utils/pools/bobMainnet.ts
+++ b/apps/frontend/src/app/5_pages/MarketMakingPage/components/AmbientMarketMaking/utils/pools/bobMainnet.ts
@@ -96,14 +96,14 @@ export const bobMainnet: AmbientLiquidityPool[] = [
   ),
   new AmbientLiquidityPool(
     'WBTC',
-    'SAT',
+    'satUSD',
     ChainIds.BOB_MAINNET,
     410,
     '0x9C82eF04eC7FEB9E07a9f2Be23cc180753CE4612',
   ),
   new AmbientLiquidityPool(
     'USDT',
-    'SAT',
+    'satUSD',
     ChainIds.BOB_MAINNET,
     400,
     '0x8C6a57d16B1ddAD730Fee27822284d085C106DbB',
diff --git a/packages/contracts/src/contracts/assets/bob.ts b/packages/contracts/src/contracts/assets/bob.ts
index 77a088768..21c595d84 100644
--- a/packages/contracts/src/contracts/assets/bob.ts
+++ b/packages/contracts/src/contracts/assets/bob.ts
@@ -83,7 +83,7 @@ export const bob: Array<AssetDetails> = [
     getIcon: async () => (await import('./icons/bob/powa')).default,
   },
   {
-    symbol: 'SAT',
+    symbol: 'satUSD',
     address: '0x78fea795cbfcc5ffd6fb5b845a4f53d25c283bdb',
     name: 'Satoshi Stablecoin',
     decimals: 18,
diff --git a/packages/sdk/src/swaps/smart-router/utils/ambient-utils.ts b/packages/sdk/src/swaps/smart-router/utils/ambient-utils.ts
index 5d7848aeb..90ff0c96a 100644
--- a/packages/sdk/src/swaps/smart-router/utils/ambient-utils.ts
+++ b/packages/sdk/src/swaps/smart-router/utils/ambient-utils.ts
@@ -195,8 +195,8 @@ const POOLS: Partial<Record<ChainIds, PoolWithIndex[]>> = {
     ['TBTC', 'SOV', 410],
     ['TBTC', 'WBTC', 400],
     ['POWA', 'SOV', 420],
-    ['WBTC', 'SAT', 410],
-    ['USDT', 'SAT', 400],
+    ['WBTC', 'satUSD', 410],
+    ['USDT', 'satUSD', 400],
   ],
   [ChainIds.BOB_TESTNET]: [
     ['USDC', 'USDT', 36000],

From c20bcb3baeaf6f46f6543e4241df505d99e80830 Mon Sep 17 00:00:00 2001
From: Rick <81699526+rick23p@users.noreply.github.com>
Date: Wed, 25 Sep 2024 17:58:23 +0330
Subject: [PATCH 4/8] SOV-4443: Rune Pools Market Making updates (#1013)

* feat: rune pool page update

* Create honest-fans-fly.md

* fix: rename pools prop

* Hide highlighted pairs functionality

---------

Co-authored-by: Peiman <25097709+Rickk137@users.noreply.github.com>
Co-authored-by: tiltom <tilnak.tomas@gmail.com>
---
 .changeset/honest-fans-fly.md                 |  5 +++++
 .../MarketMakingPage.constants.ts             |  2 ++
 .../components/MarketMaking/MarketMaking.tsx  | 19 +++++++++++++++++++
 .../components/PoolsTable/PoolsTable.tsx      | 16 ++++++++++++----
 .../utils/AmmLiquidityPool.ts                 |  2 ++
 .../frontend/src/locales/en/translations.json |  2 ++
 6 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/honest-fans-fly.md

diff --git a/.changeset/honest-fans-fly.md b/.changeset/honest-fans-fly.md
new file mode 100644
index 000000000..8869ca101
--- /dev/null
+++ b/.changeset/honest-fans-fly.md
@@ -0,0 +1,5 @@
+---
+"frontend": patch
+---
+
+SOV-4443: rune pool page update
diff --git a/apps/frontend/src/app/5_pages/MarketMakingPage/MarketMakingPage.constants.ts b/apps/frontend/src/app/5_pages/MarketMakingPage/MarketMakingPage.constants.ts
index b5edb18dc..a299ca2da 100644
--- a/apps/frontend/src/app/5_pages/MarketMakingPage/MarketMakingPage.constants.ts
+++ b/apps/frontend/src/app/5_pages/MarketMakingPage/MarketMakingPage.constants.ts
@@ -146,6 +146,8 @@ export const TESTNET_AMM = [
     ChainIds.RSK_TESTNET,
     '0x5fc0b3ac4683bd8af8e244e646d897a2c3f2a6ac',
     '0x64B1aC8301f64c92721804ed78f2ee6025aaf7cE',
+    // undefined,
+    // true,
   ),
   new AmmLiquidityPool(
     COMMON_SYMBOLS.SOV,
diff --git a/apps/frontend/src/app/5_pages/MarketMakingPage/components/MarketMaking/MarketMaking.tsx b/apps/frontend/src/app/5_pages/MarketMakingPage/components/MarketMaking/MarketMaking.tsx
index 936a9d2ce..2b4b19630 100644
--- a/apps/frontend/src/app/5_pages/MarketMakingPage/components/MarketMaking/MarketMaking.tsx
+++ b/apps/frontend/src/app/5_pages/MarketMakingPage/components/MarketMaking/MarketMaking.tsx
@@ -59,6 +59,25 @@ export const MarketMaking: FC = () => {
             onClick={setIsPromoCardClicked}
           />
 
+          {/* <Paragraph
+            className="pl-2 w-full text-base font-medium text-left mb-4 mt-8"
+            size={ParagraphSize.base}
+          >
+            {t(translations.marketMakingPage.newPairs)}
+          </Paragraph>
+          <PoolsTable
+            setActivePool={setActivePoolKey}
+            shouldScroll={isPromoCardClicked}
+            activePool={activePool}
+            showHighlightedPools
+          />
+
+          <Paragraph
+            className="pl-2 w-full text-base font-medium text-left mb-4 mt-8"
+            size={ParagraphSize.base}
+          >
+            {t(translations.marketMakingPage.allPairs)}
+          </Paragraph> */}
           <PoolsTable
             setActivePool={setActivePoolKey}
             shouldScroll={isPromoCardClicked}
diff --git a/apps/frontend/src/app/5_pages/MarketMakingPage/components/PoolsTable/PoolsTable.tsx b/apps/frontend/src/app/5_pages/MarketMakingPage/components/PoolsTable/PoolsTable.tsx
index b9b1a32d8..7311bd46f 100644
--- a/apps/frontend/src/app/5_pages/MarketMakingPage/components/PoolsTable/PoolsTable.tsx
+++ b/apps/frontend/src/app/5_pages/MarketMakingPage/components/PoolsTable/PoolsTable.tsx
@@ -24,20 +24,28 @@ type PoolsTableProps = {
   activePool?: string;
   setActivePool: (poolKey: string) => void;
   shouldScroll?: boolean;
+  showHighlightedPools?: boolean;
 };
 
 export const PoolsTable: FC<PoolsTableProps> = ({
   activePool,
   setActivePool,
   shouldScroll = false,
+  showHighlightedPools,
 }) => {
   const navigate = useNavigate();
   const { account } = useAccount();
   const tableRef = useRef<HTMLDivElement>(null);
 
+  const pools = useMemo(
+    () =>
+      ammPools.filter(pool => pool.isHighlighted === !!showHighlightedPools),
+    [showHighlightedPools],
+  );
+
   const expandedIndex = useMemo(
-    () => ammPools.findIndex(pool => pool.key === activePool),
-    [activePool],
+    () => pools.findIndex(pool => pool.key === activePool),
+    [activePool, pools],
   );
 
   const generateRowTitle = useCallback(
@@ -95,7 +103,7 @@ export const PoolsTable: FC<PoolsTableProps> = ({
   }, [activePool, shouldScroll]);
 
   return (
-    <div ref={tableRef} className="bg-gray-90 py-4 px-4 rounded w-full mt-8">
+    <div ref={tableRef} className="bg-gray-90 py-4 px-4 rounded w-full">
       {account && (
         <div className="flex justify-end mb-2.5">
           <Button
@@ -110,7 +118,7 @@ export const PoolsTable: FC<PoolsTableProps> = ({
       )}
       <Table
         columns={COLUMNS_CONFIG}
-        rows={ammPools}
+        rows={pools}
         onRowClick={onPoolClick}
         expandedIndex={expandedIndex}
         className={styles.table}
diff --git a/apps/frontend/src/app/5_pages/MarketMakingPage/utils/AmmLiquidityPool.ts b/apps/frontend/src/app/5_pages/MarketMakingPage/utils/AmmLiquidityPool.ts
index 58ada0c45..7a094f117 100644
--- a/apps/frontend/src/app/5_pages/MarketMakingPage/utils/AmmLiquidityPool.ts
+++ b/apps/frontend/src/app/5_pages/MarketMakingPage/utils/AmmLiquidityPool.ts
@@ -19,6 +19,7 @@ export class AmmLiquidityPool {
     public readonly converter: string,
     public readonly poolTokenA: string,
     public readonly poolTokenB?: string,
+    public readonly isHighlighted?: boolean,
   ) {
     if (converterVersion === 2 && !poolTokenB) {
       throw new Error(
@@ -32,6 +33,7 @@ export class AmmLiquidityPool {
     }
     this.converter = converter.toLowerCase();
     this.poolTokenA = poolTokenA.toLowerCase();
+    this.isHighlighted = Boolean(isHighlighted);
     if (poolTokenB) {
       this.poolTokenB = poolTokenB.toLowerCase();
     }
diff --git a/apps/frontend/src/locales/en/translations.json b/apps/frontend/src/locales/en/translations.json
index dc7d8e942..8de92a2a0 100644
--- a/apps/frontend/src/locales/en/translations.json
+++ b/apps/frontend/src/locales/en/translations.json
@@ -1394,6 +1394,8 @@
             "p2": "Next rewards recalibration on {{recalibrationDate}}.",
             "learnMoreLink": "Learn more"
         },
+        "newPairs": "New Pairs",
+        "allPairs": "All Pairs",
         "rewards": "Rewards",
         "poolsTable": {
             "pair": "Pair",

From 88463a86c03b8274d79770962bf8a3f95aca63e1 Mon Sep 17 00:00:00 2001
From: Pietro <74987028+pietro-maximoff@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:05:04 +0200
Subject: [PATCH 5/8] SOV-4444: Rune pools convert updates (#1009)

* chore: add new component FilterPill

* chore: update Convert Page, added filters by categories

* Create many-candles-confess.md

* chore: update component name

* chore: update component

* chore: close dropdown after click on token and keep open if category clicked

* chore: filter our wbtc from rsk network

* chore: fix mobile button view

* chore: include wbtc and tbtc in btc category

* chore: fix category
---
 .changeset/many-candles-confess.md            |   6 +
 .../ConvertPage/ConvertPage.constants.ts      |   8 +
 .../app/5_pages/ConvertPage/ConvertPage.tsx   | 230 ++++++++++++++----
 .../5_pages/ConvertPage/ConvertPage.types.ts  |   6 +
 .../AssetDropdownWithFilters.tsx              |  98 ++++++++
 .../frontend/src/locales/en/translations.json |   4 +-
 .../1_atoms/FilterPill/FilterPill.module.css  |  11 +
 .../1_atoms/FilterPill/FilterPill.stories.tsx |  44 ++++
 .../ui/src/1_atoms/FilterPill/FilterPill.tsx  |  37 +++
 packages/ui/src/1_atoms/FilterPill/index.tsx  |   1 +
 packages/ui/src/1_atoms/index.tsx             |   1 +
 11 files changed, 401 insertions(+), 45 deletions(-)
 create mode 100644 .changeset/many-candles-confess.md
 create mode 100644 apps/frontend/src/app/5_pages/ConvertPage/ConvertPage.types.ts
 create mode 100644 apps/frontend/src/app/5_pages/ConvertPage/components/AssetDropdownWithFilters/AssetDropdownWithFilters.tsx
 create mode 100644 packages/ui/src/1_atoms/FilterPill/FilterPill.module.css
 create mode 100644 packages/ui/src/1_atoms/FilterPill/FilterPill.stories.tsx
 create mode 100644 packages/ui/src/1_atoms/FilterPill/FilterPill.tsx
 create mode 100644 packages/ui/src/1_atoms/FilterPill/index.tsx

diff --git a/.changeset/many-candles-confess.md b/.changeset/many-candles-confess.md
new file mode 100644
index 000000000..ec73332dc
--- /dev/null
+++ b/.changeset/many-candles-confess.md
@@ -0,0 +1,6 @@
+---
+"frontend": patch
+"@sovryn/ui": patch
+---
+
+SOV-4444: Rune pools convert updates
diff --git a/apps/frontend/src/app/5_pages/ConvertPage/ConvertPage.constants.ts b/apps/frontend/src/app/5_pages/ConvertPage/ConvertPage.constants.ts
index e3289c9a4..7c6468306 100644
--- 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]: [],
+};
diff --git a/apps/frontend/src/app/5_pages/ConvertPage/ConvertPage.tsx b/apps/frontend/src/app/5_pages/ConvertPage/ConvertPage.tsx
index 317271ce8..f29275cae 100644
--- a/apps/frontend/src/app/5_pages/ConvertPage/ConvertPage.tsx
+++ b/apps/frontend/src/app/5_pages/ConvertPage/ConvertPage.tsx
@@ -24,7 +24,6 @@ import {
   IconNames,
   Paragraph,
   ParagraphSize,
-  Select,
   SelectOption,
   SimpleTable,
   SimpleTableRow,
@@ -51,12 +50,18 @@ import {
 } from '../../../utils/asset';
 import { removeTrailingZerosFromString } from '../../../utils/helpers';
 import { decimalic, fromWei } from '../../../utils/math';
-import { FIXED_MYNT_RATE, FIXED_RATE_ROUTES } from './ConvertPage.constants';
+import {
+  CATEGORY_TOKENS,
+  FIXED_MYNT_RATE,
+  FIXED_RATE_ROUTES,
+} from './ConvertPage.constants';
 import {
   DEFAULT_SWAP_ENTRIES,
   SMART_ROUTER_STABLECOINS,
   SWAP_ROUTES,
 } from './ConvertPage.constants';
+import { CategoryType } from './ConvertPage.types';
+import { AssetDropdownWithFilters } from './components/AssetDropdownWithFilters/AssetDropdownWithFilters';
 import { useConversionMaintenance } from './hooks/useConversionMaintenance';
 import { useGetMaximumAvailableAmount } from './hooks/useGetMaximumAvailableAmount';
 import { useHandleConversion } from './hooks/useHandleConversion';
@@ -76,23 +81,56 @@ const ConvertPage: FC = () => {
     [currentChainId],
   );
 
+  const [sourceCategories, setSourceCategories] = useState<CategoryType[]>([
+    CategoryType.All,
+  ]);
+
+  const [destinationCategories, setDestinationCategories] = useState<
+    CategoryType[]
+  >([CategoryType.All]);
+
   const tokensToOptions = useCallback(
     (
       addresses: string[],
       chain: ChainId,
       callback: (options: SelectOption<string>[]) => void,
-    ) =>
+      categories: CategoryType[],
+    ) => {
       Promise.all(
         addresses
           .filter(
-            // filter out WBTC token on rsk chain
+            // filter out WBTC token on RSK chain
             item =>
-              findAsset('WBTC', RSK_CHAIN_ID).address !== item.toLowerCase(),
+              findAsset('WBTC', RSK_CHAIN_ID).address.toLowerCase() !==
+              item.toLowerCase(),
           )
           .map(address => smartRouter.getTokenDetails(address, chain)),
-      ).then(tokens =>
+      ).then(tokens => {
+        const tokensWithCategories = tokens.map(token => {
+          const category = Object.keys(CATEGORY_TOKENS).find(type =>
+            CATEGORY_TOKENS[type].includes(token.symbol),
+          ) as CategoryType;
+          return { ...token, category };
+        });
+
+        const filteredTokens = tokensWithCategories.filter(token => {
+          if (categories.includes(CategoryType.BTC)) {
+            if (
+              token.symbol.toUpperCase() === CategoryType.BTC ||
+              token.symbol.includes(CategoryType.BTC)
+            ) {
+              return true;
+            }
+          }
+
+          return (
+            categories.includes(token.category) ||
+            categories.includes(CategoryType.All)
+          );
+        });
+
         callback(
-          tokens.map(token => ({
+          filteredTokens.map(token => ({
             value: token.symbol,
             label: (
               <AssetRenderer
@@ -103,8 +141,9 @@ const ConvertPage: FC = () => {
               />
             ),
           })),
-        ),
-      ),
+        );
+      });
+    },
     [smartRouter],
   );
 
@@ -112,8 +151,21 @@ const ConvertPage: FC = () => {
   const [searchParams, setSearchParams] = useSearchParams();
   const fromToken = searchParams.get('from') || '';
   const toToken = searchParams.get('to') || '';
+  const categoryFromToken = searchParams.get('categoryFrom') || '';
+  const categoryToToken = searchParams.get('categoryTo') || '';
   const { balance: myntBalance } = useAssetBalance(MYNT_TOKEN);
 
+  const parsedSourceCategories = useMemo(
+    () =>
+      categoryFromToken ? categoryFromToken.split(',') : [CategoryType.All],
+    [categoryFromToken],
+  );
+
+  const parsedDestinationCategories = useMemo(
+    () => (categoryToToken ? categoryToToken.split(',') : [CategoryType.All]),
+    [categoryToToken],
+  );
+
   const [slippageTolerance, setSlippageTolerance] = useState('0.5');
 
   const [priceInQuote, setPriceQuote] = useState(false);
@@ -138,6 +190,28 @@ const ConvertPage: FC = () => {
 
   const [sourceToken, setSourceToken] = useState<string>(defaultSourceToken);
 
+  const handleCategorySelect = useCallback(
+    (
+      category: CategoryType,
+      setCategories: React.Dispatch<React.SetStateAction<CategoryType[]>>,
+    ) =>
+      setCategories(prevCategories =>
+        category === CategoryType.All
+          ? [CategoryType.All]
+          : prevCategories.includes(category)
+          ? prevCategories.length === 1
+            ? [CategoryType.All]
+            : prevCategories.filter(prevCategory => prevCategory !== category)
+          : [
+              ...prevCategories.filter(
+                prevCategory => prevCategory !== CategoryType.All,
+              ),
+              category,
+            ],
+      ),
+    [],
+  );
+
   const [showAdvancedSettings, setShowAdvancedSettings] = useState(true);
 
   const [tokenOptions, setTokenOptions] = useState<SelectOption<string>[]>([]);
@@ -157,8 +231,15 @@ const ConvertPage: FC = () => {
   useEffect(() => {
     smartRouter
       .getEntries(currentChainId)
-      .then(tokens => tokensToOptions(tokens, currentChainId, setTokenOptions));
-  }, [currentChainId, smartRouter, tokensToOptions]);
+      .then(tokens =>
+        tokensToOptions(
+          tokens,
+          currentChainId,
+          setTokenOptions,
+          sourceCategories,
+        ),
+      );
+  }, [currentChainId, smartRouter, tokensToOptions, sourceCategories]);
 
   useEffect(() => {
     (async () => {
@@ -168,15 +249,26 @@ const ConvertPage: FC = () => {
       );
       smartRouter
         .getDestination(currentChainId, sourceTokenDetails.address)
-        .then(tokens => {
-          tokensToOptions(tokens, currentChainId, setDestinationTokenOptions);
-        });
+        .then(tokens =>
+          tokensToOptions(
+            tokens,
+            currentChainId,
+            setDestinationTokenOptions,
+            destinationCategories,
+          ),
+        );
 
       if (sourceToken === MYNT_TOKEN) {
         setDestinationToken(COMMON_SYMBOLS.SOV);
       }
     })();
-  }, [currentChainId, smartRouter, sourceToken, tokensToOptions]);
+  }, [
+    currentChainId,
+    smartRouter,
+    sourceToken,
+    tokensToOptions,
+    destinationCategories,
+  ]);
 
   const sourceTokenOptions = useMemo(
     () =>
@@ -331,18 +423,6 @@ const ConvertPage: FC = () => {
     setHasQuoteError(false);
   }, []);
 
-  const getAssetRenderer = useCallback(
-    (token: string) => (
-      <AssetRenderer
-        showAssetLogo
-        asset={token}
-        chainId={currentChainId}
-        assetClassName="font-medium"
-      />
-    ),
-    [currentChainId],
-  );
-
   const { handleSubmit } = useHandleConversion(
     sourceToken,
     destinationToken,
@@ -410,7 +490,26 @@ const ConvertPage: FC = () => {
     if (toToken) {
       setDestinationToken(toToken);
     }
-  }, [fromToken, toToken]);
+    if (categoryFromToken) {
+      const sourceCategories = parsedSourceCategories.map(
+        category => CategoryType[category] || CategoryType.All,
+      );
+      setSourceCategories(sourceCategories);
+    }
+    if (categoryToToken) {
+      const destinationCategories = parsedDestinationCategories.map(
+        category => CategoryType[category] || CategoryType.All,
+      );
+      setDestinationCategories(destinationCategories);
+    }
+  }, [
+    fromToken,
+    toToken,
+    categoryFromToken,
+    categoryToToken,
+    parsedSourceCategories,
+    parsedDestinationCategories,
+  ]);
 
   useEffect(() => {
     if (hasMyntBalance && fromToken === MYNT_TOKEN) {
@@ -435,10 +534,51 @@ const ConvertPage: FC = () => {
       urlParams.delete('to');
     }
 
-    if (toToken !== destinationToken || fromToken !== sourceToken) {
+    if (sourceToken === destinationToken) {
+      urlParams.delete('to');
+    }
+
+    if (
+      sourceCategories.length > 0 &&
+      !sourceCategories.includes(CategoryType.All)
+    ) {
+      urlParams.set('categoryFrom', sourceCategories.join(','));
+    } else {
+      urlParams.delete('categoryFrom');
+    }
+
+    if (
+      destinationCategories.length > 0 &&
+      !destinationCategories.includes(CategoryType.All)
+    ) {
+      urlParams.set('categoryTo', destinationCategories.join(','));
+    } else {
+      urlParams.delete('categoryTo');
+    }
+
+    if (sourceToken === destinationToken) {
+      setDestinationToken('');
+    }
+
+    if (
+      toToken !== destinationToken ||
+      fromToken !== sourceToken ||
+      categoryToToken !== destinationCategories.join(',') ||
+      categoryFromToken !== sourceCategories.join(',')
+    ) {
       setSearchParams(new URLSearchParams(urlParams));
     }
-  }, [sourceToken, destinationToken, setSearchParams, toToken, fromToken]);
+  }, [
+    sourceToken,
+    destinationToken,
+    setSearchParams,
+    toToken,
+    fromToken,
+    sourceCategories,
+    destinationCategories,
+    categoryToToken,
+    categoryFromToken,
+  ]);
 
   useEffect(() => {
     if (!account) {
@@ -491,14 +631,14 @@ const ConvertPage: FC = () => {
                 dataAttribute="convert-from-amount"
                 placeholder="0"
               />
-
-              <Select
-                value={sourceToken}
-                onChange={onSourceTokenChange}
-                options={sourceTokenOptions}
-                labelRenderer={() => getAssetRenderer(sourceToken)}
-                className="min-w-[6.7rem]"
-                menuClassName="max-h-[10rem] sm:max-h-[12rem]"
+              <AssetDropdownWithFilters
+                token={sourceToken}
+                selectedCategories={sourceCategories}
+                tokenOptions={sourceTokenOptions}
+                onCategorySelect={category =>
+                  handleCategorySelect(category, setSourceCategories)
+                }
+                onTokenChange={onSourceTokenChange}
                 dataAttribute="convert-from-asset"
               />
             </div>
@@ -540,12 +680,14 @@ const ConvertPage: FC = () => {
                 className="w-full flex-grow-0 flex-shrink"
                 dataAttribute="convert-to-amount"
               />
-              <Select
-                value={destinationToken}
-                onChange={onDestinationTokenChange}
-                options={destinationTokenOptions}
-                className="min-w-[6.7rem]"
-                menuClassName="max-h-[10rem] sm:max-h-[12rem]"
+              <AssetDropdownWithFilters
+                token={destinationToken}
+                selectedCategories={destinationCategories}
+                tokenOptions={destinationTokenOptions}
+                onCategorySelect={category =>
+                  handleCategorySelect(category, setDestinationCategories)
+                }
+                onTokenChange={onDestinationTokenChange}
                 dataAttribute="convert-to-asset"
               />
             </div>
diff --git a/apps/frontend/src/app/5_pages/ConvertPage/ConvertPage.types.ts b/apps/frontend/src/app/5_pages/ConvertPage/ConvertPage.types.ts
new file mode 100644
index 000000000..6bb3eb548
--- /dev/null
+++ b/apps/frontend/src/app/5_pages/ConvertPage/ConvertPage.types.ts
@@ -0,0 +1,6 @@
+export enum CategoryType {
+  All = 'All',
+  Stablecoins = 'Stablecoins',
+  BTC = 'BTC',
+  Runes = 'Runes',
+}
diff --git a/apps/frontend/src/app/5_pages/ConvertPage/components/AssetDropdownWithFilters/AssetDropdownWithFilters.tsx b/apps/frontend/src/app/5_pages/ConvertPage/components/AssetDropdownWithFilters/AssetDropdownWithFilters.tsx
new file mode 100644
index 000000000..3324f525d
--- /dev/null
+++ b/apps/frontend/src/app/5_pages/ConvertPage/components/AssetDropdownWithFilters/AssetDropdownWithFilters.tsx
@@ -0,0 +1,98 @@
+import React, { FC, useCallback } from 'react';
+
+import { t } from 'i18next';
+
+import {
+  Dropdown,
+  DropdownMode,
+  FilterPill,
+  Menu,
+  MenuItem,
+  SelectOption,
+} from '@sovryn/ui';
+
+import { AssetRenderer } from '../../../../2_molecules/AssetRenderer/AssetRenderer';
+import { useCurrentChain } from '../../../../../hooks/useChainStore';
+import { translations } from '../../../../../locales/i18n';
+import { CategoryType } from '../../ConvertPage.types';
+
+type AssetDropdownWithFiltersProps = {
+  token: string;
+  selectedCategories: CategoryType[];
+  tokenOptions: SelectOption<string>[];
+  onCategorySelect: (category: CategoryType) => void;
+  onTokenChange: (token: string) => void;
+  dataAttribute: string;
+};
+
+export const AssetDropdownWithFilters: FC<AssetDropdownWithFiltersProps> = ({
+  token,
+  selectedCategories,
+  tokenOptions,
+  onCategorySelect,
+  onTokenChange,
+  dataAttribute,
+}) => {
+  const currentChainId = useCurrentChain();
+
+  const getAssetRenderer = useCallback(
+    (token: string) =>
+      token ? (
+        <AssetRenderer
+          showAssetLogo
+          asset={token}
+          chainId={currentChainId}
+          assetClassName="font-medium"
+        />
+      ) : (
+        t(translations.common.select)
+      ),
+    [currentChainId],
+  );
+
+  const handleCategoryClick = useCallback(
+    (e: React.MouseEvent, category: CategoryType) => {
+      e.stopPropagation();
+      onCategorySelect(category);
+    },
+    [onCategorySelect],
+  );
+
+  return (
+    <Dropdown
+      text={getAssetRenderer(token)}
+      className="min-w-[6.7rem] flex-none border border-gray-70"
+      dropdownClassName="max-h-[12rem] sm:max-h-[14.5rem] border border-gray-70 rounded min-w-48"
+      mode={DropdownMode.right}
+      dataAttribute={dataAttribute}
+      closeOnClick
+    >
+      <div className="items-center flex-wrap bg-gray-80 p-3 grid grid-cols-2 gap-2">
+        {Object.values(CategoryType).map(category => (
+          <FilterPill
+            text={category}
+            key={category}
+            isActive={selectedCategories.includes(category)}
+            onClick={e => handleCategoryClick(e, category)}
+          />
+        ))}
+      </div>
+      <Menu>
+        {tokenOptions.map(tokenOption => (
+          <MenuItem
+            key={tokenOption.value}
+            text={tokenOption.label}
+            onClick={() => onTokenChange(tokenOption.value)}
+            isActive={tokenOption.value === token}
+          />
+        ))}
+        {tokenOptions.length === 0 && (
+          <MenuItem
+            text={t(translations.convertPage.form.noAvailableTokens)}
+            disabled
+          />
+        )}
+      </Menu>
+    </Dropdown>
+  );
+};
diff --git a/apps/frontend/src/locales/en/translations.json b/apps/frontend/src/locales/en/translations.json
index 8de92a2a0..611e9a8e8 100644
--- a/apps/frontend/src/locales/en/translations.json
+++ b/apps/frontend/src/locales/en/translations.json
@@ -25,6 +25,7 @@
             "back": "Back"
         },
         "na": "N/A",
+        "select": "Select",
         "tables": {
             "columnTitles": {
                 "amount": "Amount",
@@ -423,7 +424,8 @@
             "convertFrom": "Convert from",
             "convertTo": "To",
             "invalidAmountError": "Exceeds maximum amount",
-            "quoteError": "No route found, please try another asset or a lower amount"
+            "quoteError": "No route found, please try another asset or a lower amount",
+            "noAvailableTokens": "No available tokens"
         },
         "txDialog": {
             "convertTitle": "Convert {{from}} to {{to}}",
diff --git a/packages/ui/src/1_atoms/FilterPill/FilterPill.module.css b/packages/ui/src/1_atoms/FilterPill/FilterPill.module.css
new file mode 100644
index 000000000..37f63f3e4
--- /dev/null
+++ b/packages/ui/src/1_atoms/FilterPill/FilterPill.module.css
@@ -0,0 +1,11 @@
+.filterPill {
+  @apply flex items-center justify-center text-gray-30 text-xs border border-gray-70 rounded-full px-3 h-[1.625rem] font-medium transition cursor-pointer;
+  &.active {
+    @apply bg-gray-70 text-gray-10 cursor-pointer;
+  }
+  @screen lg {
+    &:hover {
+      @apply bg-gray-70 text-gray-10 cursor-pointer;
+    }
+  }
+}
diff --git a/packages/ui/src/1_atoms/FilterPill/FilterPill.stories.tsx b/packages/ui/src/1_atoms/FilterPill/FilterPill.stories.tsx
new file mode 100644
index 000000000..c3bfbd32a
--- /dev/null
+++ b/packages/ui/src/1_atoms/FilterPill/FilterPill.stories.tsx
@@ -0,0 +1,44 @@
+import { ComponentStory } from '@storybook/react';
+
+import React from 'react';
+
+import { FilterPill } from './FilterPill';
+
+export default {
+  title: 'Atoms/FilterPill',
+  component: FilterPill,
+};
+
+const Template: ComponentStory<typeof FilterPill> = args => (
+  <FilterPill {...args} />
+);
+
+export const Default = Template.bind({});
+
+Default.args = {
+  text: 'Stablecoins',
+};
+
+Default.argTypes = {
+  className: {
+    control: 'text',
+    description: 'The class to apply to the filter pill',
+  },
+  dataAttribute: {
+    control: 'text',
+    description:
+      'The data id to apply as HTML attribute to this component instance. This should be unique per component instance on the page',
+  },
+  text: {
+    control: 'text',
+    description: 'The label of the filter pill',
+  },
+  isActive: {
+    control: 'boolean',
+    description: 'Whether the filter pill is active',
+  },
+  onClick: {
+    action: 'clicked',
+    description: 'The function to call when the filter pill is clicked',
+  },
+};
diff --git a/packages/ui/src/1_atoms/FilterPill/FilterPill.tsx b/packages/ui/src/1_atoms/FilterPill/FilterPill.tsx
new file mode 100644
index 000000000..3c0439acf
--- /dev/null
+++ b/packages/ui/src/1_atoms/FilterPill/FilterPill.tsx
@@ -0,0 +1,37 @@
+import React, { FC, ReactNode } from 'react';
+
+import classNames from 'classnames';
+
+import { applyDataAttr } from '../../utils';
+import styles from './FilterPill.module.css';
+
+type FilterPillProps = {
+  text: ReactNode;
+  dataAttribute?: string;
+  className?: string;
+  isActive?: boolean;
+  onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void;
+};
+
+export const FilterPill: FC<FilterPillProps> = ({
+  text,
+  dataAttribute,
+  className,
+  isActive = false,
+  onClick,
+}) => (
+  <button
+    {...applyDataAttr(dataAttribute)}
+    className={classNames(
+      styles.filterPill,
+      {
+        [styles.active]: isActive,
+      },
+      className,
+    )}
+    type="button"
+    onClick={onClick}
+  >
+    {text}
+  </button>
+);
diff --git a/packages/ui/src/1_atoms/FilterPill/index.tsx b/packages/ui/src/1_atoms/FilterPill/index.tsx
new file mode 100644
index 000000000..7ac24a0ed
--- /dev/null
+++ b/packages/ui/src/1_atoms/FilterPill/index.tsx
@@ -0,0 +1 @@
+export * from './FilterPill';
diff --git a/packages/ui/src/1_atoms/index.tsx b/packages/ui/src/1_atoms/index.tsx
index 06ab25585..2bf6366ba 100644
--- a/packages/ui/src/1_atoms/index.tsx
+++ b/packages/ui/src/1_atoms/index.tsx
@@ -17,3 +17,4 @@ export * from './Toggle';
 export * from './Slider';
 export * from './Bar/Bar';
 export * from './Slider/Slider';
+export * from './FilterPill';

From b41a6af194e169cce3d973b54da8628396f7b7f6 Mon Sep 17 00:00:00 2001
From: tiltom <tiltom.defi@protonmail.com>
Date: Wed, 2 Oct 2024 12:01:51 +0200
Subject: [PATCH 6/8] SOV-4461: Remove POWA page (#1014)

* Remove POWA page

* Create lovely-buses-greet.md

* Delete obsolete translations
---
 .changeset/lovely-buses-greet.md              |   5 +
 .../3_organisms/Header/Header.constants.tsx   |   5 -
 .../LeaderboardPage/LeaderboardPage.tsx       |  35 ------
 .../components/CTALinks/CTALinks.tsx          |  81 -------------
 .../components/Intro/Intro.tsx                |  66 -----------
 .../Leaderboard/Leaderboard.constants.tsx     |  31 -----
 .../components/Leaderboard/Leaderboard.tsx    |  25 ----
 .../Leaderboard/Leaderboard.types.ts          |  19 ---
 .../Leaderboard/components/Badges/Badges.tsx  |  22 ----
 .../components/Badges/Badges.utils.ts         |  63 ----------
 .../BaseTable/BaseTable.constants.tsx         |  51 ---------
 .../components/BaseTable/BaseTable.tsx        |  89 ---------------
 .../components/BaseTable/BaseTable.types.ts   |   4 -
 .../components/BaseTable/BaseTable.utils.tsx  |  71 ------------
 .../components/BaseTable/hooks/useGetData.ts  |  61 ----------
 .../SocialLeaderboard.constants.ts            |   2 -
 .../SocialLeaderboard/SocialLeaderboard.tsx   |  31 -----
 .../StakingLeaderboard/StakingLeaderboard.tsx |  14 ---
 .../TradingLeaderboard/TradingLeaderboard.tsx |   8 --
 .../PointsSection/PointsSection.module.css    |   3 -
 .../PointsSection/PointsSection.tsx           | 102 -----------------
 .../frontend/src/locales/en/translations.json | 108 +-----------------
 apps/frontend/src/router.tsx                  |   8 --
 23 files changed, 6 insertions(+), 898 deletions(-)
 create mode 100644 .changeset/lovely-buses-greet.md
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/LeaderboardPage.tsx
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/CTALinks/CTALinks.tsx
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/Intro/Intro.tsx
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/Leaderboard.constants.tsx
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/Leaderboard.tsx
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/Leaderboard.types.ts
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/Badges/Badges.tsx
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/Badges/Badges.utils.ts
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.constants.tsx
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.tsx
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.types.ts
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.utils.tsx
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/hooks/useGetData.ts
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/SocialLeaderboard/SocialLeaderboard.constants.ts
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/SocialLeaderboard/SocialLeaderboard.tsx
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/StakingLeaderboard/StakingLeaderboard.tsx
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/TradingLeaderboard/TradingLeaderboard.tsx
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/PointsSection/PointsSection.module.css
 delete mode 100644 apps/frontend/src/app/5_pages/LeaderboardPage/components/PointsSection/PointsSection.tsx

diff --git a/.changeset/lovely-buses-greet.md b/.changeset/lovely-buses-greet.md
new file mode 100644
index 000000000..dab22cb7b
--- /dev/null
+++ b/.changeset/lovely-buses-greet.md
@@ -0,0 +1,5 @@
+---
+"frontend": patch
+---
+
+SOV-4461: Remove POWA page
diff --git a/apps/frontend/src/app/3_organisms/Header/Header.constants.tsx b/apps/frontend/src/app/3_organisms/Header/Header.constants.tsx
index 242adff05..78e8630e3 100644
--- 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/5_pages/LeaderboardPage/LeaderboardPage.tsx b/apps/frontend/src/app/5_pages/LeaderboardPage/LeaderboardPage.tsx
deleted file mode 100644
index 19d06c76c..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/LeaderboardPage.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React, { FC, useRef, useState } from 'react';
-
-import { RSK_CHAIN_ID } from '../../../config/chains';
-
-import { NetworkBanner } from '../../2_molecules/NetworkBanner/NetworkBanner';
-import { CTALinks } from './components/CTALinks/CTALinks';
-import { Intro } from './components/Intro/Intro';
-import { Leaderboard } from './components/Leaderboard/Leaderboard';
-import { PointsSection } from './components/PointsSection/PointsSection';
-
-const LeaderboardPage: FC = () => {
-  const tableRef = useRef<HTMLDivElement>(null);
-  const pointsSectionRef = useRef<HTMLDivElement>(null);
-  const [tabIndex, setTabIndex] = useState(0);
-
-  return (
-    <div className="w-full flex items-center flex-col px-0 md:px-20">
-      <NetworkBanner
-        requiredChainId={RSK_CHAIN_ID}
-        childClassName="flex items-center flex-col "
-      >
-        <Intro pointsSectionRef={pointsSectionRef} />
-        <CTALinks tableRef={tableRef} setTabIndex={setTabIndex} />
-        <Leaderboard
-          index={tabIndex}
-          setIndex={setTabIndex}
-          tableRef={tableRef}
-        />
-        <PointsSection pointsSectionRef={pointsSectionRef} />
-      </NetworkBanner>
-    </div>
-  );
-};
-
-export default LeaderboardPage;
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/CTALinks/CTALinks.tsx b/apps/frontend/src/app/5_pages/LeaderboardPage/components/CTALinks/CTALinks.tsx
deleted file mode 100644
index 3491a9541..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/CTALinks/CTALinks.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import React, {
-  Dispatch,
-  FC,
-  RefObject,
-  SetStateAction,
-  useCallback,
-  useMemo,
-} from 'react';
-
-import { t } from 'i18next';
-import { useNavigate } from 'react-router-dom';
-
-import { CTA } from '../../../../2_molecules/CTA/CTA';
-import socialBg from '../../../../../assets/images/Leaderboard/social.svg';
-import stakeBg from '../../../../../assets/images/Leaderboard/stake.svg';
-import tradeBg from '../../../../../assets/images/Leaderboard/trade.svg';
-import { translations } from '../../../../../locales/i18n';
-import { scrollToElement } from '../../../../../utils/helpers';
-
-const baseTranslation = translations.leaderboardPage.ctaLinksSection;
-
-type CTALinksProps = {
-  tableRef: RefObject<HTMLDivElement>;
-  setTabIndex: Dispatch<SetStateAction<number>>;
-};
-
-export const CTALinks: FC<CTALinksProps> = ({ tableRef, setTabIndex }) => {
-  const navigate = useNavigate();
-
-  const socialClickHandler = useCallback(() => {
-    if (tableRef.current) {
-      scrollToElement(tableRef);
-      setTabIndex(2);
-    }
-  }, [setTabIndex, tableRef]);
-
-  const options = useMemo(
-    () => [
-      {
-        title: t(baseTranslation.stake.title),
-        description: t(baseTranslation.stake.description),
-        action: t(baseTranslation.stake.cta),
-        onClick: () => navigate('/earn/staking'),
-        backgroundImage: stakeBg,
-      },
-      {
-        title: t(baseTranslation.trade.title),
-        description: t(baseTranslation.trade.description),
-        action: t(baseTranslation.trade.cta),
-        onClick: () =>
-          window.open('https://app.babelfish.money/convert', '_blank'),
-        backgroundImage: tradeBg,
-      },
-      {
-        title: t(baseTranslation.social.title),
-        description: t(baseTranslation.social.description),
-        action: t(baseTranslation.social.cta),
-        onClick: socialClickHandler,
-        backgroundImage: socialBg,
-      },
-    ],
-    [navigate, socialClickHandler],
-  );
-
-  return (
-    <div className="w-full sm:p-6 p-4 sm:w-3/4 mt-8 bg-gray-80 rounded min-h-64 grid md:grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 xl:gap-6 gap-4">
-      {options.map(
-        ({ backgroundImage, title, description, action, onClick }, index) => (
-          <CTA
-            index={index}
-            backgroundImage={backgroundImage}
-            title={title}
-            description={description}
-            action={action}
-            navigateTo={onClick}
-          />
-        ),
-      )}
-    </div>
-  );
-};
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Intro/Intro.tsx b/apps/frontend/src/app/5_pages/LeaderboardPage/components/Intro/Intro.tsx
deleted file mode 100644
index 13dc56813..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Intro/Intro.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import React, { FC, RefObject, useCallback } from 'react';
-
-import { t } from 'i18next';
-import { Trans } from 'react-i18next';
-
-import { Button, ButtonStyle } from '@sovryn/ui';
-
-import { POWA_LINK } from '../../../../../constants/links';
-import { translations } from '../../../../../locales/i18n';
-import { scrollToElement } from '../../../../../utils/helpers';
-
-const baseTranslation = translations.leaderboardPage;
-
-type IntroProps = {
-  pointsSectionRef: RefObject<HTMLDivElement>;
-};
-
-export const Intro: FC<IntroProps> = ({ pointsSectionRef }) => {
-  const primaryCtaClickHandler = useCallback(() => {
-    scrollToElement(pointsSectionRef);
-  }, [pointsSectionRef]);
-
-  return (
-    <div className="w-full md:w-[26rem] text-center">
-      <div className="text-2xl font-medium mt-4 lg:mt-9">
-        {t(baseTranslation.title)}
-      </div>
-      <div className="text-sm font-semibold mt-4">
-        <Trans i18nKey={t(baseTranslation.subtitle)} />
-      </div>
-      <div className="text-sm font-medium mt-6">
-        <Trans
-          i18nKey={t(baseTranslation.description1)}
-          components={[<span className="font-bold">Bitcoin OS</span>]}
-        />
-      </div>
-      <div className="text-sm font-medium mt-4">
-        {t(baseTranslation.description2)}
-      </div>
-
-      <div className="mt-4">
-        <Button
-          text={t(baseTranslation.primaryCta)}
-          style={ButtonStyle.secondary}
-          className="mr-4"
-          onClick={primaryCtaClickHandler}
-        />
-        <Button
-          text={t(baseTranslation.secondaryCta)}
-          style={ButtonStyle.ghost}
-          hrefExternal
-          href={POWA_LINK}
-        />
-      </div>
-
-      <div className="mt-11">
-        <div className="text-2xl font-medium mt-9">
-          {t(baseTranslation.ctaLinksSection.title)}
-        </div>
-        <div className="text-sm font-semibold mt-4">
-          {t(baseTranslation.ctaLinksSection.subtitle)}
-        </div>
-      </div>
-    </div>
-  );
-};
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/Leaderboard.constants.tsx b/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/Leaderboard.constants.tsx
deleted file mode 100644
index 7d433d555..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/Leaderboard.constants.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import React from 'react';
-
-import { t } from 'i18next';
-
-import { translations } from '../../../../../locales/i18n';
-import { SocialLeaderboard } from './components/SocialLeaderboard/SocialLeaderboard';
-import { StakingLeaderboard } from './components/StakingLeaderboard/StakingLeaderboard';
-import { TradingLeaderboard } from './components/TradingLeaderboard/TradingLeaderboard';
-
-const ACTIVE_CLASSNAME = 'border-t-primary-30';
-
-export const TAB_ITEMS = [
-  {
-    label: t(translations.leaderboardPage.tables.trading.tabTitle),
-    content: <TradingLeaderboard />,
-    activeClassName: ACTIVE_CLASSNAME,
-    dataAttribute: 'trading',
-  },
-  {
-    label: t(translations.leaderboardPage.tables.staking.tabTitle),
-    content: <StakingLeaderboard />,
-    activeClassName: ACTIVE_CLASSNAME,
-    dataAttribute: 'staking',
-  },
-  {
-    label: t(translations.leaderboardPage.tables.social.tabTitle),
-    content: <SocialLeaderboard />,
-    activeClassName: ACTIVE_CLASSNAME,
-    dataAttribute: 'social',
-  },
-];
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/Leaderboard.tsx b/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/Leaderboard.tsx
deleted file mode 100644
index 340cd4094..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/Leaderboard.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React, { Dispatch, FC, RefObject, SetStateAction } from 'react';
-
-import { Tabs } from '@sovryn/ui';
-
-import { TAB_ITEMS } from './Leaderboard.constants';
-
-type LeaderboardProps = {
-  index: number;
-  setIndex: Dispatch<SetStateAction<number>>;
-  tableRef: RefObject<HTMLDivElement>;
-};
-
-export const Leaderboard: FC<LeaderboardProps> = ({
-  index,
-  setIndex,
-  tableRef,
-}) => (
-  <Tabs
-    index={index}
-    items={TAB_ITEMS}
-    onChange={setIndex}
-    className="w-full mt-12"
-    wrapperRef={tableRef}
-  />
-);
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/Leaderboard.types.ts b/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/Leaderboard.types.ts
deleted file mode 100644
index 826a8b0e7..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/Leaderboard.types.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-export enum UserBadges {
-  EARLY_USER = 'early_user',
-  GENESIS = 'genesis',
-  ORIGIN = 'origin',
-  NFT = 'nft',
-  TOP_IMPORTER_DAY = 'top_importer_day',
-  TOP_IMPORTER_WEEK = 'top_importer_week',
-  VOTER = 'voter',
-  TOP_STAKER_DAY = 'top_staker_day',
-  TOP_STAKER_WEEK = 'top_staker_week',
-  WALLET = 'wallet',
-}
-
-export type User = {
-  rank: string;
-  wallet: string;
-  points: string;
-  badges: UserBadges[];
-};
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/Badges/Badges.tsx b/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/Badges/Badges.tsx
deleted file mode 100644
index ec19e2a89..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/Badges/Badges.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import React, { FC } from 'react';
-
-import { Badge } from '@sovryn/ui';
-
-import { User } from '../../Leaderboard.types';
-import { getBadgeDetails } from './Badges.utils';
-
-type BadgesProps = {
-  user: User;
-};
-
-export const Badges: FC<BadgesProps> = ({ user }) => (
-  <>
-    {user.badges.map(badge => {
-      const { title, style } = getBadgeDetails(badge);
-
-      return (
-        <Badge content={title} className="p-2 mr-1 rounded" style={style} />
-      );
-    })}
-  </>
-);
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/Badges/Badges.utils.ts b/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/Badges/Badges.utils.ts
deleted file mode 100644
index 9e4443a26..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/Badges/Badges.utils.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { t } from 'i18next';
-
-import { BadgeStyle } from '@sovryn/ui';
-
-import { translations } from '../../../../../../../locales/i18n';
-import { UserBadges } from '../../Leaderboard.types';
-
-const baseTranslation = translations.leaderboardPage.tables.baseTable.badges;
-
-export const getBadgeDetails = (badge: UserBadges) => {
-  switch (badge) {
-    case UserBadges.EARLY_USER:
-      return {
-        title: t(baseTranslation.earlyUser),
-        style: BadgeStyle.teal,
-      };
-    case UserBadges.GENESIS:
-      return {
-        title: t(baseTranslation.genesis),
-        style: BadgeStyle.teal,
-      };
-    case UserBadges.NFT:
-      return {
-        title: t(baseTranslation.nft),
-        style: BadgeStyle.teal,
-      };
-    case UserBadges.ORIGIN:
-      return {
-        title: t(baseTranslation.origin),
-        style: BadgeStyle.teal,
-      };
-    case UserBadges.TOP_IMPORTER_DAY:
-      return {
-        title: t(baseTranslation.topImporterDay),
-        style: BadgeStyle.grayLight,
-      };
-    case UserBadges.TOP_IMPORTER_WEEK:
-      return {
-        title: t(baseTranslation.topImporterWeek),
-        style: BadgeStyle.grayLight,
-      };
-    case UserBadges.VOTER:
-      return {
-        title: t(baseTranslation.voter),
-        style: BadgeStyle.teal,
-      };
-    case UserBadges.TOP_STAKER_DAY:
-      return {
-        title: t(baseTranslation.topStakerDay),
-        style: BadgeStyle.brown,
-      };
-    case UserBadges.TOP_STAKER_WEEK:
-      return {
-        title: t(baseTranslation.topStakerWeek),
-        style: BadgeStyle.brown,
-      };
-    case UserBadges.WALLET:
-      return {
-        title: t(baseTranslation.wallet),
-        style: BadgeStyle.gray,
-      };
-  }
-};
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.constants.tsx b/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.constants.tsx
deleted file mode 100644
index be74c18e6..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.constants.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-
-import { t } from 'i18next';
-
-import { prettyTx } from '@sovryn/ui';
-
-import { AmountRenderer } from '../../../../../../2_molecules/AmountRenderer/AmountRenderer';
-import { translations } from '../../../../../../../locales/i18n';
-import { User } from '../../Leaderboard.types';
-import { Badges } from '../Badges/Badges';
-
-export const TRADING_LEADERBOARD_URL =
-  'https://redash.sovryn.app/api/queries/544/results.json?api_key=52Jy2PGF5HZVye97NCG9e8nNDDPZ1iFo65Hfo1sk';
-
-export const STAKING_LEADERBOARD_URL =
-  'https://redash.sovryn.app/api/queries/545/results.json?api_key=sjTLMq48pU0yHJlDBWrFiQQS2x0jTtk7BChYTC8J';
-
-export const PAGE_SIZE = 50;
-
-export const MAXIMUM_USERS_TO_SHOW = 500;
-
-export const COLUMNS_CONFIG = (isSingleUser: boolean) => [
-  {
-    id: '',
-    title: isSingleUser
-      ? t(translations.leaderboardPage.tables.baseTable.yourPosition)
-      : '',
-    cellRenderer: (row: User) => row.rank,
-  },
-  {
-    id: isSingleUser ? '' : 'wallet',
-    title: isSingleUser
-      ? ''
-      : t(translations.leaderboardPage.tables.baseTable.participant),
-    cellRenderer: (row: User) => (
-      <div>
-        <div>{prettyTx(row.wallet)}</div>
-        <div className="flex-wrap gap-y-1">
-          <Badges user={row} />
-        </div>
-      </div>
-    ),
-  },
-  {
-    id: 'points',
-    title: t(translations.leaderboardPage.tables.baseTable.points),
-    cellRenderer: (row: User) => (
-      <AmountRenderer value={row.points} showRoundingPrefix={false} />
-    ),
-  },
-];
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.tsx b/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.tsx
deleted file mode 100644
index 2880a4e18..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import React, { FC, useMemo } from 'react';
-
-import { t } from 'i18next';
-
-import { Table, Pagination } from '@sovryn/ui';
-
-import { ConnectWalletMessage } from '../../../../../../2_molecules/ConnectWalletMessage/ConnectWalletMessage';
-import { useAccount } from '../../../../../../../hooks/useAccount';
-import { useHandlePagination } from '../../../../../../../hooks/useHandlePagination';
-import { translations } from '../../../../../../../locales/i18n';
-import {
-  COLUMNS_CONFIG,
-  PAGE_SIZE,
-  STAKING_LEADERBOARD_URL,
-  TRADING_LEADERBOARD_URL,
-} from './BaseTable.constants';
-import { TableType } from './BaseTable.types';
-import { generateRowTitle } from './BaseTable.utils';
-import { useGetData } from './hooks/useGetData';
-
-type BaseTableProps = {
-  type: TableType;
-  tableSubtitle?: string;
-};
-
-export const BaseTable: FC<BaseTableProps> = ({ type, tableSubtitle }) => {
-  const { account } = useAccount();
-
-  const isStakingTable = useMemo(() => type === TableType.Staking, [type]);
-
-  const dataUrl = useMemo(
-    () => (isStakingTable ? STAKING_LEADERBOARD_URL : TRADING_LEADERBOARD_URL),
-    [isStakingTable],
-  );
-  const { loading, users, connectedWalletRow } = useGetData(dataUrl);
-
-  const { page, onPageChange, paginatedItems, isNextButtonDisabled } =
-    useHandlePagination(users, PAGE_SIZE);
-
-  return (
-    <div className="p-4">
-      <div className="my-8 mx-4 rounded">
-        <Table
-          rows={connectedWalletRow}
-          columns={COLUMNS_CONFIG(true)}
-          rowTitle={generateRowTitle}
-          noData={
-            !account ? (
-              <ConnectWalletMessage
-                text={t(translations.leaderboardPage.tables.connectWalletText)}
-                ctaText={t(
-                  translations.leaderboardPage.tables.connectWalletCta,
-                )}
-              />
-            ) : (
-              t(translations.leaderboardPage.tables.participantNotFound)
-            )
-          }
-          isLoading={!!account && loading}
-          flatMode={true}
-        />
-      </div>
-      {tableSubtitle && (
-        <div className="text-sm text-center mb-1">{tableSubtitle}</div>
-      )}
-      <div className="bg-gray-80 py-4 px-4 rounded">
-        <Table
-          columns={COLUMNS_CONFIG(false)}
-          rows={paginatedItems}
-          isLoading={loading}
-          rowTitle={generateRowTitle}
-          className="bg-gray-80 text-gray-10 lg:px-6 lg:py-4"
-          dataAttribute="trading-leaderboard"
-          preventExpandOnClickClass="prevent-row-click"
-          flatMode={true}
-        />
-        <Pagination
-          page={page}
-          totalItems={users.length}
-          className="lg:pb-6 mt-3 lg:mt-6 max-w-20"
-          onChange={onPageChange}
-          itemsPerPage={PAGE_SIZE}
-          isNextButtonDisabled={isNextButtonDisabled}
-          dataAttribute="trading-leaderboard-pagination"
-        />
-      </div>
-    </div>
-  );
-};
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.types.ts b/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.types.ts
deleted file mode 100644
index 372068ff0..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum TableType {
-  Staking = 'staking',
-  Trading = 'trading',
-}
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.utils.tsx b/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.utils.tsx
deleted file mode 100644
index 452f2cb8b..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/BaseTable.utils.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import React from 'react';
-
-import { prettyTx } from '@sovryn/ui';
-
-import { AmountRenderer } from '../../../../../../2_molecules/AmountRenderer/AmountRenderer';
-import { User, UserBadges } from '../../Leaderboard.types';
-import { Badges } from '../Badges/Badges';
-
-export const parseBadges = (data: any): UserBadges[] => {
-  let badges: UserBadges[] = [];
-
-  if (data.early_user === 1) {
-    badges.push(UserBadges.EARLY_USER);
-  }
-
-  if (data.genesis === 1) {
-    badges.push(UserBadges.GENESIS);
-  }
-
-  if (data.origin === 1) {
-    badges.push(UserBadges.ORIGIN);
-  }
-
-  if (data.nft === 1) {
-    badges.push(UserBadges.NFT);
-  }
-
-  if (data.top_importer_day === 1) {
-    badges.push(UserBadges.TOP_IMPORTER_DAY);
-  }
-
-  if (data.top_importer_week === 1) {
-    badges.push(UserBadges.TOP_IMPORTER_WEEK);
-  }
-
-  if (data.voter === 1) {
-    badges.push(UserBadges.VOTER);
-  }
-
-  if (data.top_staker_day === 1) {
-    badges.push(UserBadges.TOP_STAKER_DAY);
-  }
-
-  if (data.top_staker_week === 1) {
-    badges.push(UserBadges.TOP_STAKER_WEEK);
-  }
-
-  // Do not delete, may be used in future
-  // if (data.wallet === 1) {
-  //   badges.push(UserBadges.WALLET);
-  // }
-
-  return badges;
-};
-
-export const generateRowTitle = (row: User) => (
-  <div className="flex w-full">
-    <div className="text-xs font-medium w-9 text-left">{row.rank}</div>
-    <div className="w-full">
-      <div className="flex items-center justify-between mb-1 text-xs font-medium">
-        <div className="mr-4">{prettyTx(row.wallet)}</div>
-        <div>
-          <AmountRenderer value={row.points} showRoundingPrefix={false} />
-        </div>
-      </div>
-      <div className="flex flex-wrap gap-y-1">
-        <Badges user={row} />
-      </div>
-    </div>
-  </div>
-);
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/hooks/useGetData.ts b/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/hooks/useGetData.ts
deleted file mode 100644
index 92967fa39..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/BaseTable/hooks/useGetData.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
-
-import { useAccount } from '../../../../../../../../hooks/useAccount';
-import { User } from '../../../Leaderboard.types';
-import { MAXIMUM_USERS_TO_SHOW } from '../BaseTable.constants';
-import { parseBadges } from '../BaseTable.utils';
-
-export const useGetData = (url: string) => {
-  const { account } = useAccount();
-  const [users, setUsers] = useState<User[]>([]);
-  const [loading, setLoading] = useState(false);
-
-  const fetchData = useCallback(async () => {
-    setLoading(true);
-    const response = await fetch(url);
-
-    if (response.ok) {
-      const data = await response.json();
-
-      if (data) {
-        const result = data?.query_result?.data?.rows;
-
-        if (result?.length > 0) {
-          setUsers(
-            result.map(item => ({
-              rank: item.rank,
-              wallet: item.user,
-              points: item.points,
-              badges: parseBadges(item),
-            })),
-          );
-        }
-      }
-    }
-    setLoading(false);
-  }, [url]);
-
-  const connectedWalletRow = useMemo(() => {
-    if (account && users.length > 0) {
-      const user = users.find(
-        item => item.wallet.toLowerCase() === account.toLowerCase(),
-      );
-
-      if (user) {
-        return [user];
-      }
-      return [];
-    }
-    return [];
-  }, [account, users]);
-
-  useEffect(() => {
-    fetchData();
-  }, [fetchData]);
-
-  return {
-    loading,
-    users: users.slice(0, MAXIMUM_USERS_TO_SHOW),
-    connectedWalletRow,
-  };
-};
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/SocialLeaderboard/SocialLeaderboard.constants.ts b/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/SocialLeaderboard/SocialLeaderboard.constants.ts
deleted file mode 100644
index 2024e43ad..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/SocialLeaderboard/SocialLeaderboard.constants.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const COMPETITION_URL = 'https://gleam.io/EK36C/influence-powa';
-export const LEADERBOARD_URL = 'https://gleam.io/EK36C/leaderboard';
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/SocialLeaderboard/SocialLeaderboard.tsx b/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/SocialLeaderboard/SocialLeaderboard.tsx
deleted file mode 100644
index 05aa6e4c1..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/SocialLeaderboard/SocialLeaderboard.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import React, { FC } from 'react';
-
-import {
-  COMPETITION_URL,
-  LEADERBOARD_URL,
-} from './SocialLeaderboard.constants';
-
-export const SocialLeaderboard: FC = () => {
-  return (
-    <div className="p-4">
-      <div className="flex flex-col mt-8">
-        <div className="flex flex-row justify-center">
-          <iframe
-            src={COMPETITION_URL}
-            title="competition"
-            className="rounded w-[30.25rem] h-[30.75rem]"
-          ></iframe>
-        </div>
-      </div>
-
-      <div className="flex flex-row justify-center mb-8">
-        <iframe
-          src={LEADERBOARD_URL}
-          title="leaderboard"
-          id="leaderboard"
-          className="rounded-b w-[30.25rem] h-[31.25rem]"
-        ></iframe>
-      </div>
-    </div>
-  );
-};
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/StakingLeaderboard/StakingLeaderboard.tsx b/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/StakingLeaderboard/StakingLeaderboard.tsx
deleted file mode 100644
index faff2cb14..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/StakingLeaderboard/StakingLeaderboard.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React, { FC } from 'react';
-
-import { t } from 'i18next';
-
-import { translations } from '../../../../../../../locales/i18n';
-import { BaseTable } from '../BaseTable/BaseTable';
-import { TableType } from '../BaseTable/BaseTable.types';
-
-export const StakingLeaderboard: FC = () => (
-  <BaseTable
-    type={TableType.Staking}
-    tableSubtitle={t(translations.leaderboardPage.tables.staking.tableSubtitle)}
-  />
-);
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/TradingLeaderboard/TradingLeaderboard.tsx b/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/TradingLeaderboard/TradingLeaderboard.tsx
deleted file mode 100644
index b11dad78e..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/Leaderboard/components/TradingLeaderboard/TradingLeaderboard.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import React, { FC } from 'react';
-
-import { BaseTable } from '../BaseTable/BaseTable';
-import { TableType } from '../BaseTable/BaseTable.types';
-
-export const TradingLeaderboard: FC = () => (
-  <BaseTable type={TableType.Trading} />
-);
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/PointsSection/PointsSection.module.css b/apps/frontend/src/app/5_pages/LeaderboardPage/components/PointsSection/PointsSection.module.css
deleted file mode 100644
index 3558ac4c0..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/PointsSection/PointsSection.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.tableRow {
-  @apply flex justify-between;
-}
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPage/components/PointsSection/PointsSection.tsx b/apps/frontend/src/app/5_pages/LeaderboardPage/components/PointsSection/PointsSection.tsx
deleted file mode 100644
index 6debcae66..000000000
--- a/apps/frontend/src/app/5_pages/LeaderboardPage/components/PointsSection/PointsSection.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import React, { FC, RefObject } from 'react';
-
-import classNames from 'classnames';
-import { t } from 'i18next';
-
-import { SimpleTable, SimpleTableRow } from '@sovryn/ui';
-
-import { translations } from '../../../../../locales/i18n';
-import styles from './PointsSection.module.css';
-
-const baseTranslation = translations.leaderboardPage.pointsSection;
-const tablesTranslation = translations.leaderboardPage.pointsSection.tables;
-
-type PointsSectionProps = {
-  pointsSectionRef: RefObject<HTMLDivElement>;
-};
-
-export const PointsSection: FC<PointsSectionProps> = ({ pointsSectionRef }) => (
-  <>
-    <div
-      ref={pointsSectionRef}
-      className="w-full md:w-[26rem] text-center mb-8"
-    >
-      <div className="text-2xl font-medium mt-9">
-        {t(baseTranslation.title)}
-      </div>
-      <div className="text-sm font-semibold mt-4">
-        {t(baseTranslation.description)}
-      </div>
-    </div>
-
-    <div className="w-full grid md:grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 md:gap-6 gap-4 mb-8 md:mb-16">
-      <SimpleTable>
-        <div className="text-gray-30 text-sm font-medium mb-3">
-          {t(tablesTranslation.trading.title)}
-        </div>
-        <SimpleTableRow
-          className={classNames(styles.tableRow, 'mb-2.5')}
-          label={t(tablesTranslation.trading.item1)}
-          value={10}
-        />
-        <SimpleTableRow
-          className={classNames(styles.tableRow, 'mb-2.5')}
-          label={t(tablesTranslation.trading.item2)}
-          value={1}
-        />
-        <SimpleTableRow
-          className={classNames(styles.tableRow, 'mb-2.5')}
-          label={t(tablesTranslation.trading.item3)}
-          value={25}
-        />
-        <SimpleTableRow
-          className={classNames(styles.tableRow, 'mb-2.5')}
-          label={t(tablesTranslation.trading.item4)}
-          value="+10%"
-        />
-        <SimpleTableRow
-          className={styles.tableRow}
-          label={t(tablesTranslation.trading.item5)}
-          value="+10%"
-        />
-      </SimpleTable>
-
-      <SimpleTable>
-        <div className="text-gray-30 text-sm font-medium mb-3">
-          {t(tablesTranslation.staking.title)}
-        </div>
-        <SimpleTableRow
-          className={classNames(styles.tableRow, 'mb-2.5')}
-          label={t(tablesTranslation.staking.item1)}
-          value={10}
-        />
-        <SimpleTableRow
-          className={classNames(styles.tableRow, 'mb-2.5')}
-          label={t(tablesTranslation.staking.item2)}
-          value={1}
-        />
-        <SimpleTableRow
-          className={classNames(styles.tableRow, 'mb-2.5')}
-          label={t(tablesTranslation.staking.item3)}
-          value="+10%"
-        />
-        <SimpleTableRow
-          className={styles.tableRow}
-          label={t(tablesTranslation.staking.item4)}
-          value="+10%"
-        />
-      </SimpleTable>
-
-      <SimpleTable>
-        <div className="text-gray-30 text-sm font-medium mb-3">
-          {t(tablesTranslation.social.title)}
-        </div>
-        <SimpleTableRow
-          className={classNames(styles.tableRow, 'mb-2.5')}
-          label={t(tablesTranslation.social.item1)}
-          value=""
-        />
-      </SimpleTable>
-    </div>
-  </>
-);
diff --git a/apps/frontend/src/locales/en/translations.json b/apps/frontend/src/locales/en/translations.json
index 611e9a8e8..290633cc9 100644
--- a/apps/frontend/src/locales/en/translations.json
+++ b/apps/frontend/src/locales/en/translations.json
@@ -127,8 +127,7 @@
                     "ercBridge": "ERC-20",
                     "ercBridgeDescription": "Transfer between BOB and other chains"
                 }
-            },
-            "claimPowa": "Claim POWA"
+            }
         }
     },
     "footer": {
@@ -934,92 +933,6 @@
         }
     },
 
-    "leaderboardPage": {
-        "headerLink": "POWA Points",
-        "headerDescription": "Earn Points, Earn POWA",
-        "title": "You’ve got the POWA!",
-        "subtitle": "The POWA Points campaign is now closed. <br/>POWA will drop on the halving.",
-        "description1": "POWA is the most powaful Bitcoin token! Minted on an entirely new Bitcoin technology, POWA tokens allow early use of what's to come with the <0>BitcoinOS</0> launch.",
-        "description2": "Stake, Trade, or use your Influence to earn Points and POWA. Connect your wallet to see how many points you already have!",
-        "primaryCta": "How to earn points",
-        "secondaryCta": "More about POWA",
-        "ctaLinksSection": {
-            "title": "1 Trillion POWA Prize Pool!",
-            "subtitle": "The more points you’ll have - the more POWA you’ll get!",
-            "stake": {
-                "title": "Stake",
-                "description": "The longer you stake, the more POWA you’ll get! Existing stakes earn 1 point for each Voting Power. New and re-stakes earn 10 points for each VP.",
-                "cta": "Stake SOV"
-            },
-            "trade": {
-                "title": "Trade",
-                "description": "Get 25 points per $1 value you bridge into Sovryn, 10 points per $1 deposit into the SOV or DLLR AMMs, and 1 point per $1 trade.",
-                "cta": "Deposit stablecoins"
-            },
-            "social": {
-                "title": "Influence",
-                "description": "Earn points for your social influence! Like, Share, and Tweet to be given the POWA!",
-                "cta": "Twitter quests"
-            }
-        },
-        "tables": {
-            "connectWalletText": "Connect your wallet to see how many points you’ve got.",
-            "participantNotFound": "Take any action on the dapp to start earning points",
-            "connectWalletCta": "Connect wallet",
-            "baseTable": {
-                "participant": "Participant",
-                "points": "Points",
-                "yourPosition": "Your position",
-                "badges": {
-                    "earlyUser": "+5% Early user",
-                    "genesis": "+5% Genesis",
-                    "nft": "+5% NFT holder",
-                    "origin": "+5% Origin",
-                    "topImporterDay": "+10% Daily top importer",
-                    "topImporterWeek": "+10% Weekly top importer",
-                    "voter": "+5% Voter",
-                    "topStakerDay": "+10% Daily top staker",
-                    "topStakerWeek": "+10% Weekly top trader",
-                    "wallet": "+100 points"
-                }
-            },
-            "trading": {
-                "tabTitle": "Trading"
-            },
-            "staking": {
-                "tabTitle": "Staking",
-                "tableSubtitle": "Please note that the system is currently undercounting restaking. This will be addressed in a coming update."
-            },
-            "social": {
-                "tabTitle": "Influence"
-            }
-        },
-        "pointsSection": {
-            "title": "Gain POWA!",
-            "description": "Actions on the Sovryn dApp and on Twitter earn you points. Points convert to POWA - the next Bitcoin token class.",
-            "tables": {
-                "trading": {
-                    "title": "Trade",
-                    "item1": "Provide liquidity for SOV or DLLR AMMs, per $1 value",
-                    "item2": "Any AMM trade, per $1 value",
-                    "item3": "Import stablecoins, per $1 value",
-                    "item4": "Weekly top  importer",
-                    "item5": "Daily top importer"
-                },
-                "staking": {
-                    "title": "Stake",
-                    "item1": "New and re-stakes, 1VP",
-                    "item2": "Existing stakes, 1 VP",
-                    "item3": "Weekly top staker",
-                    "item4": "Daily top staker"
-                },
-                "social": {
-                    "title": "Influence",
-                    "item1": "See Influence leaderboard for current quests points breakdown."
-                }
-            }
-        }
-    },
     "leaderboardPointsPage": {
         "meta": {
             "title": "Spice Leaderboard - Sovryn"
@@ -2024,25 +1937,6 @@
         },
         "ammCta": "Claim LP tokens"
     },
-    "claimPowaPage": {
-        "meta": {
-            "title": "POWA to the People - Sovryn"
-        },
-        "title": "POWA to the People",
-        "subtitle": "Claim your POWA",
-        "claimPowa": "Claim your POWA",
-        "details": "Details about the POWA campaign",
-        "descriptionValues": {
-            "aboutClaiming": "Claim your POWA rune token to the same Rootstock address you used for the Trading and Staking leaderboards or the one you gave out in Gleam for the influence campaign. Make sure it’s connected now to Sovryn.",
-            "rskAddressCTA": "Supply one here.",
-            "faq": "Got questions? Please ask in our <0>telegram channel.</0> ",
-            "faqCTA": "telegram channel."
-        },
-        "claimTx": {
-            "title": "Claim your POWA",
-            "description": "Claim your POWA points"
-        }
-    },
     "unclaimedVestings": {
         "text": "You have {{value}} LM SOV rewards vested stakes that you need to withdraw before claiming more.",
         "cta": "Open Rewards page"
diff --git a/apps/frontend/src/router.tsx b/apps/frontend/src/router.tsx
index c8b20965d..9bdb6b6e2 100644
--- a/apps/frontend/src/router.tsx
+++ b/apps/frontend/src/router.tsx
@@ -62,10 +62,6 @@ const ProtocolDataPage = loadable(
   () => import('./app/5_pages/ProtocolDataPage/ProtocolDataPage'),
 );
 
-const LeaderboardPage = loadable(
-  () => import('./app/5_pages/LeaderboardPage/LeaderboardPage'),
-);
-
 const LeaderboardPointsPage = loadable(
   () => import('./app/5_pages/LeaderboardPointsPage/LeaderboardPointsPage'),
 );
@@ -153,10 +149,6 @@ const routes = [
         path: '/earn/staking',
         element: <StakePage />,
       },
-      {
-        path: '/powa',
-        element: <LeaderboardPage />,
-      },
       {
         path: '/bob-lp-points',
         element: <LeaderboardPointsPage />,

From 973291307343797713ccee6e7907ea51a0209a46 Mon Sep 17 00:00:00 2001
From: Rick <81699526+rick23p@users.noreply.github.com>
Date: Fri, 4 Oct 2024 12:30:52 +0330
Subject: [PATCH 7/8] SOV-4467: Spice Leaderboard adjustments for Season 3
 (#1016)

* feat: spice season 3 update

* Create spotty-poems-happen.md
---
 .changeset/spotty-poems-happen.md             |  5 +
 .../src/app/3_organisms/Header/Header.tsx     |  2 +-
 .../LeaderboardPointsPage.types.ts            |  2 +
 .../LeaderboardPoints.constants.tsx           | 15 +++
 .../LeaderboardPoints/hooks/useGetPoints.ts   | 94 +++++++++++++------
 .../frontend/src/locales/en/translations.json |  6 +-
 6 files changed, 92 insertions(+), 32 deletions(-)
 create mode 100644 .changeset/spotty-poems-happen.md

diff --git a/.changeset/spotty-poems-happen.md b/.changeset/spotty-poems-happen.md
new file mode 100644
index 000000000..80a51cf3b
--- /dev/null
+++ b/.changeset/spotty-poems-happen.md
@@ -0,0 +1,5 @@
+---
+"frontend": patch
+---
+
+SOV-4467: Spice Leaderboard adjustments for Season 3
diff --git a/apps/frontend/src/app/3_organisms/Header/Header.tsx b/apps/frontend/src/app/3_organisms/Header/Header.tsx
index db16572b2..7615c068d 100644
--- 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/LeaderboardPointsPage/LeaderboardPointsPage.types.ts b/apps/frontend/src/app/5_pages/LeaderboardPointsPage/LeaderboardPointsPage.types.ts
index 91c708ec5..cd2350006 100644
--- a/apps/frontend/src/app/5_pages/LeaderboardPointsPage/LeaderboardPointsPage.types.ts
+++ b/apps/frontend/src/app/5_pages/LeaderboardPointsPage/LeaderboardPointsPage.types.ts
@@ -17,4 +17,6 @@ export type UserDeposit = {
 export type UserPoints = {
   wallet: string;
   points: number;
+  s3Points: number;
+  total: number;
 };
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPointsPage/components/LeaderboardPoints/LeaderboardPoints.constants.tsx b/apps/frontend/src/app/5_pages/LeaderboardPointsPage/components/LeaderboardPoints/LeaderboardPoints.constants.tsx
index bf008315a..beaa01cdc 100644
--- a/apps/frontend/src/app/5_pages/LeaderboardPointsPage/components/LeaderboardPoints/LeaderboardPoints.constants.tsx
+++ b/apps/frontend/src/app/5_pages/LeaderboardPointsPage/components/LeaderboardPoints/LeaderboardPoints.constants.tsx
@@ -11,6 +11,9 @@ import { translations } from '../../../../../locales/i18n';
 export const DATA_ENDPOINT_URL =
   'https://season2-spice-points-bucket.s3.us-east-2.amazonaws.com/Total_S1&S2_Spice_Leaderboard.json';
 
+export const S3_DATA_ENDPOINT_URL =
+  'https://season2-spice-points-bucket.s3.us-east-2.amazonaws.com/Total_S3_Spice_Leaderboard.json';
+
 export const PAGE_SIZE = 50;
 
 export const COLUMNS_CONFIG = (isSingleUser: boolean = false) => [
@@ -38,4 +41,16 @@ export const COLUMNS_CONFIG = (isSingleUser: boolean = false) => [
     cellRenderer: user => <AmountRenderer value={user.points} />,
     sampleData: '111,111,111.1111',
   },
+  {
+    id: '',
+    title: t(translations.leaderboardPointsPage.table.spice3),
+    cellRenderer: user => <AmountRenderer value={user.s3Points} />,
+    sampleData: '111,111,111.1111',
+  },
+  {
+    id: '',
+    title: t(translations.leaderboardPointsPage.table.total),
+    cellRenderer: user => <AmountRenderer value={user.total} />,
+    sampleData: '111,111,111.1111',
+  },
 ];
diff --git a/apps/frontend/src/app/5_pages/LeaderboardPointsPage/components/LeaderboardPoints/hooks/useGetPoints.ts b/apps/frontend/src/app/5_pages/LeaderboardPointsPage/components/LeaderboardPoints/hooks/useGetPoints.ts
index 8ec0f5890..0b845a0d5 100644
--- a/apps/frontend/src/app/5_pages/LeaderboardPointsPage/components/LeaderboardPoints/hooks/useGetPoints.ts
+++ b/apps/frontend/src/app/5_pages/LeaderboardPointsPage/components/LeaderboardPoints/hooks/useGetPoints.ts
@@ -1,66 +1,102 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useMemo } from 'react';
 
+import { RSK_CHAIN_ID } from '../../../../../../config/chains';
+
+import { useCacheCall } from '../../../../../../hooks';
 import { useAccount } from '../../../../../../hooks/useAccount';
 import { areAddressesEqual } from '../../../../../../utils/helpers';
 import { UserPoints } from '../../../LeaderboardPointsPage.types';
-import { DATA_ENDPOINT_URL } from '../LeaderboardPoints.constants';
+import {
+  DATA_ENDPOINT_URL,
+  S3_DATA_ENDPOINT_URL,
+} from '../LeaderboardPoints.constants';
 
 export const useGetPoints = () => {
   const { account } = useAccount();
 
-  const [data, setData] = useState<UserPoints[]>([]);
+  const { value: data } = useCacheCall(
+    'bob-lp-points',
+    RSK_CHAIN_ID,
+    async () => {
+      const [data, s3Data] = await Promise.all([
+        fetch(DATA_ENDPOINT_URL).then(response => response?.json()),
+        fetch(S3_DATA_ENDPOINT_URL).then(response => response?.json()),
+      ]);
+
+      const result: { [key: string]: UserPoints } = {};
+
+      data.forEach(user => {
+        const points = parseFloat(user.points.replace(/,/g, ''));
+
+        result[user.toAddress.toLowerCase()] = {
+          wallet: user.toAddress,
+          points,
+          s3Points: 0,
+          total: points,
+        };
+      });
 
-  useEffect(() => {
-    if (!data || data.length === 0) {
-      fetch(DATA_ENDPOINT_URL)
-        .then(response => response?.json())
-        .then(data => {
-          if (!data) {
-            return;
-          }
+      s3Data.forEach(user => {
+        const s3Points = parseFloat(user.points.replace(/,/g, ''));
+        const key = user.toAddress.toLowerCase();
 
-          const result: UserPoints[] = data.map(user => ({
+        if (!(key in result)) {
+          result[key] = {
             wallet: user.toAddress,
-            points: parseFloat(user.points.replace(/,/g, '')),
-          }));
+            points: 0,
+            s3Points,
+            total: s3Points,
+          };
+        } else {
+          const points = result[key].points;
 
-          setData(result);
-        });
-    }
-  }, [data]);
+          result[key] = {
+            wallet: user.toAddress,
+            points,
+            s3Points,
+            total: points + s3Points,
+          };
+        }
+      });
 
-  const sortedUsers = useMemo(() => {
-    return data.sort((a, b) => b.points - a.points);
-  }, [data]);
+      return Object.keys(result)
+        .map(key => ({ ...result[key] }))
+        .sort((user1, user2) => (user1.total < user2.total ? 1 : -1));
+    },
+    [],
+    [],
+  );
 
   const userIndex = useMemo(() => {
-    return sortedUsers.findIndex(user =>
-      areAddressesEqual(user.wallet, account),
-    );
-  }, [sortedUsers, account]);
+    return data.findIndex(user => areAddressesEqual(user.wallet, account));
+  }, [data, account]);
 
   const connectedWalletPoints = useMemo(() => {
     if (userIndex !== -1) {
-      const { wallet, points } = sortedUsers[userIndex];
+      const { wallet, points, s3Points, total } = data[userIndex];
       return [
         {
           id: userIndex + 1,
           wallet,
           points,
+          s3Points,
+          total,
         },
       ];
     }
     return [];
-  }, [sortedUsers, userIndex]);
+  }, [data, userIndex]);
 
   const points = useMemo(
     () =>
-      sortedUsers.map(({ wallet, points }, index) => ({
+      data.map(({ wallet, points, s3Points, total }, index) => ({
         id: index + 1,
         wallet,
         points,
+        s3Points,
+        total,
       })),
-    [sortedUsers],
+    [data],
   );
 
   return {
diff --git a/apps/frontend/src/locales/en/translations.json b/apps/frontend/src/locales/en/translations.json
index 290633cc9..2a57765bc 100644
--- a/apps/frontend/src/locales/en/translations.json
+++ b/apps/frontend/src/locales/en/translations.json
@@ -938,7 +938,7 @@
             "title": "Spice Leaderboard - Sovryn"
         },
         "title": "Spice Leaderboard",
-        "description1": "Spice Points are rewards earned by providing liquidity and staking SOV on the Sovryn DEX on the BOB chain. These points track user contributions and engagement, helping determine future rewards allocated by the BOB team. This leaderboard displays only the rewards distributed by Sovryn (combined Season 1 &2) and allows you to check your accumulated points and current position.",
+        "description1": "Spice Points are rewards earned by providing liquidity and staking SOV on the Sovryn DEX on the BOB chain. These points track user contributions and engagement, helping determine future rewards allocated by the BOB team. This leaderboard displays only the rewards distributed by Sovryn and allows you to check your accumulated points and current position.",
         "description2": "If you want to earn your Spice points simply bridge your funds via <0>BOB Fusion and</0> start providing liquidity via our the <1>Market Making</1>  page or start <2>Staking SOV</2> tokens.",
         "claimDescription": "Users who participated in the Season 1 Liquidity Provisioning campaign can claim their LP tokens here:",
         "leaderboard": "Leaderboard",
@@ -955,7 +955,9 @@
             "participant": "Participant",
             "balance": "Balance",
             "points": "Points",
-            "spice": "Spice",
+            "spice": "Season 1 and 2 Spice",
+            "spice3": "Season 3 Spice",
+            "total": "Total",
             "extraSpice": "Extra Spice",
             "extraSpiceShot": "Extra Spice Shot",
             "runes": "Runes"

From 68c336791aab8b057b90c137a77f801faf77bcd4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 4 Oct 2024 12:56:09 +0300
Subject: [PATCH 8/8] Version Packages (#1008)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/green-forks-rule.md     |  8 --------
 .changeset/honest-fans-fly.md      |  5 -----
 .changeset/lovely-buses-greet.md   |  5 -----
 .changeset/many-candles-confess.md |  6 ------
 .changeset/spotty-poems-happen.md  |  5 -----
 apps/frontend/CHANGELOG.md         | 15 +++++++++++++++
 apps/frontend/package.json         |  2 +-
 packages/contracts/CHANGELOG.md    |  6 ++++++
 packages/contracts/package.json    |  2 +-
 packages/sdk/CHANGELOG.md          |  8 ++++++++
 packages/sdk/package.json          |  2 +-
 packages/ui/CHANGELOG.md           |  6 ++++++
 packages/ui/package.json           |  2 +-
 13 files changed, 39 insertions(+), 33 deletions(-)
 delete mode 100644 .changeset/green-forks-rule.md
 delete mode 100644 .changeset/honest-fans-fly.md
 delete mode 100644 .changeset/lovely-buses-greet.md
 delete mode 100644 .changeset/many-candles-confess.md
 delete mode 100644 .changeset/spotty-poems-happen.md

diff --git a/.changeset/green-forks-rule.md b/.changeset/green-forks-rule.md
deleted file mode 100644
index 3cb6e25a7..000000000
--- a/.changeset/green-forks-rule.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-'frontend': patch
-'@sovryn/contracts': patch
-'@sovryn/sdk': patch
----
-
-SOV-4457: rebrand SAT token
-
diff --git a/.changeset/honest-fans-fly.md b/.changeset/honest-fans-fly.md
deleted file mode 100644
index 8869ca101..000000000
--- a/.changeset/honest-fans-fly.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"frontend": patch
----
-
-SOV-4443: rune pool page update
diff --git a/.changeset/lovely-buses-greet.md b/.changeset/lovely-buses-greet.md
deleted file mode 100644
index dab22cb7b..000000000
--- a/.changeset/lovely-buses-greet.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"frontend": patch
----
-
-SOV-4461: Remove POWA page
diff --git a/.changeset/many-candles-confess.md b/.changeset/many-candles-confess.md
deleted file mode 100644
index ec73332dc..000000000
--- a/.changeset/many-candles-confess.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"frontend": patch
-"@sovryn/ui": patch
----
-
-SOV-4444: Rune pools convert updates
diff --git a/.changeset/spotty-poems-happen.md b/.changeset/spotty-poems-happen.md
deleted file mode 100644
index 80a51cf3b..000000000
--- a/.changeset/spotty-poems-happen.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"frontend": patch
----
-
-SOV-4467: Spice Leaderboard adjustments for Season 3
diff --git a/apps/frontend/CHANGELOG.md b/apps/frontend/CHANGELOG.md
index 0c1fb7857..15753c71d 100644
--- a/apps/frontend/CHANGELOG.md
+++ b/apps/frontend/CHANGELOG.md
@@ -1,5 +1,20 @@
 # 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
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index 1c39a248a..3d148dddc 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.1.21",
+  "version": "1.1.22",
   "homepage": ".",
   "private": true,
   "dependencies": {
diff --git a/packages/contracts/CHANGELOG.md b/packages/contracts/CHANGELOG.md
index d97d385c7..1859c4fbd 100644
--- a/packages/contracts/CHANGELOG.md
+++ b/packages/contracts/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sovryn/contracts
 
+## 1.2.1
+
+### Patch Changes
+
+- ef2f1abe: SOV-4457: rebrand SAT token
+
 ## 1.2.0
 
 ### Minor Changes
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index f06388f6d..a16fa7e02 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sovryn/contracts",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "license": "MIT",
diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md
index 284e93168..50a8b275f 100644
--- a/packages/sdk/CHANGELOG.md
+++ b/packages/sdk/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @sovryn/sdk
 
+## 2.0.1
+
+### Patch Changes
+
+- ef2f1abe: SOV-4457: rebrand SAT token
+- Updated dependencies [ef2f1abe]
+  - @sovryn/contracts@1.2.1
+
 ## 2.0.0
 
 ### Patch Changes
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index c86d63a28..082091137 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sovryn/sdk",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "license": "MIT",
diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md
index 0132db49f..553ed140b 100644
--- a/packages/ui/CHANGELOG.md
+++ b/packages/ui/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sovryn/ui
 
+## 1.0.31
+
+### Patch Changes
+
+- 88463a86: SOV-4444: Rune pools convert updates
+
 ## 1.0.30
 
 ### Patch Changes
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 0c4489eb0..effdde850 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sovryn/ui",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",
   "types": "./dist/typings.d.ts",