From c738b01382a89430944d1a1227154e4037e01b25 Mon Sep 17 00:00:00 2001
From: Linkie Link <linkielink.dev@gmail.com>
Date: Wed, 6 Dec 2023 15:27:25 +0100
Subject: [PATCH] feat: make USDC the standard secondary asset (for trade)
 (#681)

---
 src/constants/assets.ts | 76 ++++++++++++++++++++---------------------
 src/pages/_layout.tsx   |  2 ++
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/constants/assets.ts b/src/constants/assets.ts
index 709a3dd4..04eeab79 100644
--- a/src/constants/assets.ts
+++ b/src/constants/assets.ts
@@ -19,6 +19,44 @@ export const ASSETS: Asset[] = [
     pythPriceFeedId: '5867f5683c757393a0670ef0f701490950fe93fdb006d181c8265a831ac0c5c6',
     pythHistoryFeedId: 'Crypto.OSMO/USD',
   },
+  {
+    symbol: 'USDC',
+    name: 'Noble',
+    id: 'USDC',
+    denom: 'ibc/498A0751C798A0D9A389AA3691123DADA57DAA4FE165D5C75894505B876BA6E4',
+    color: '#478edc',
+    logo: '/images/tokens/usdc.svg',
+    decimals: 6,
+    hasOraclePrice: true,
+    isEnabled: true,
+    isMarket: true,
+    isDisplayCurrency: true,
+    isStable: true,
+    isBorrowEnabled: true,
+    isAutoLendEnabled: true,
+    pythPriceFeedId: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
+    pythHistoryFeedId: 'Crypto.USDC/USD',
+    poolId: ENV.NETWORK === NETWORK.DEVNET ? 678 : 1221,
+  },
+  {
+    symbol: 'USDC.axl',
+    name: 'Axelar USDC',
+    id: 'axlUSDC',
+    denom: 'ibc/D189335C6E4A68B513C10AB227BF1C1D38C746766278BA3EEB4FB14124F1D858',
+    color: '#478edc',
+    logo: '/images/tokens/axlusdc.svg',
+    decimals: 6,
+    hasOraclePrice: true,
+    isEnabled: true,
+    isMarket: true,
+    isDisplayCurrency: true,
+    isStable: true,
+    isBorrowEnabled: true,
+    isAutoLendEnabled: true,
+    pythPriceFeedId: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
+    pythHistoryFeedId: 'Crypto.USDC/USD',
+    poolId: 678,
+  },
   {
     symbol: 'ATOM',
     name: 'Atom',
@@ -119,44 +157,6 @@ export const ASSETS: Asset[] = [
     isEnabled: true,
     forceFetchPrice: true,
   },
-  {
-    symbol: 'USDC.axl',
-    name: 'Axelar USDC',
-    id: 'axlUSDC',
-    denom: 'ibc/D189335C6E4A68B513C10AB227BF1C1D38C746766278BA3EEB4FB14124F1D858',
-    color: '#478edc',
-    logo: '/images/tokens/axlusdc.svg',
-    decimals: 6,
-    hasOraclePrice: true,
-    isEnabled: true,
-    isMarket: true,
-    isDisplayCurrency: true,
-    isStable: true,
-    isBorrowEnabled: true,
-    isAutoLendEnabled: true,
-    pythPriceFeedId: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
-    pythHistoryFeedId: 'Crypto.USDC/USD',
-    poolId: 678,
-  },
-  {
-    symbol: 'USDC',
-    name: 'Noble',
-    id: 'USDC',
-    denom: 'ibc/498A0751C798A0D9A389AA3691123DADA57DAA4FE165D5C75894505B876BA6E4',
-    color: '#478edc',
-    logo: '/images/tokens/usdc.svg',
-    decimals: 6,
-    hasOraclePrice: true,
-    isEnabled: true,
-    isMarket: true,
-    isDisplayCurrency: true,
-    isStable: true,
-    isBorrowEnabled: true,
-    isAutoLendEnabled: true,
-    pythPriceFeedId: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
-    pythHistoryFeedId: 'Crypto.USDC/USD',
-    poolId: ENV.NETWORK === NETWORK.DEVNET ? 678 : 1221,
-  },
   {
     symbol: 'USDT',
     id: 'USDT',
diff --git a/src/pages/_layout.tsx b/src/pages/_layout.tsx
index d10dd1fa..71557dc7 100644
--- a/src/pages/_layout.tsx
+++ b/src/pages/_layout.tsx
@@ -42,6 +42,7 @@ function PageContainer(props: Props) {
 export default function Layout({ children }: { children: React.ReactNode }) {
   const location = useLocation()
   const focusComponent = useStore((s) => s.focusComponent)
+  const address = useStore((s) => s.address)
   const [reduceMotion] = useLocalStorage<boolean>(
     LocalStorageKeys.REDUCE_MOTION,
     DEFAULT_SETTINGS.reduceMotion,
@@ -66,6 +67,7 @@ export default function Layout({ children }: { children: React.ReactNode }) {
           'flex',
           'min-h-screen gap-6 px-4 py-6 w-full relative',
           !focusComponent &&
+            address &&
             isFullWidth &&
             accountId &&
             (accountDetailsExpanded ? 'pr-118' : 'pr-24'),