Merge branch 'develop' of https://github.com/mars-protocol/mars-v2-frontend into linkielink-patch-1

# Conflicts: # .env # .env.production # src/components/perps/BalancesTable/index.tsx
tidy: format
2024-02-14 19:29:07 +01:00 · 2024-02-14 19:15:17 +01:00 · 2024-02-14 19:14:34 +01:00 · 2024-02-14 16:53:17 +01:00 · 2024-02-14 16:43:57 +01:00 · 2024-02-14 14:49:15 +01:00
3 changed files with 12 additions and 69 deletions
--- a/public/images/tokens/stdydx.svg
+++ b/public/images/tokens/stdydx.svg
@ -1,36 +0,0 @@
-<svg viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <rect width="240" height="240" rx="120" fill="#E50571" />
-  <path d="M149.107 60.9396L63.3276 181.702H89.6637L175.888 60.9396H149.107Z" fill="white" />
-  <path
-    d="M92.4053 60.9396L117.644 96.5239L104.476 115.934L65.5205 60.9396H92.4053Z"
-    fill="url(#paint0_linear_6269_3439)"
-  />
-  <path
-    d="M151.664 181.712L123.682 142.354L136.851 123.483L178 181.712H151.664Z"
-    fill="url(#paint1_linear_6269_3439)"
-  />
-  <defs>
-    <linearGradient
-      id="paint0_linear_6269_3439"
-      x1="86.3698"
-      y1="68.4878"
-      x2="121.753"
-      y2="111.957"
-      gradientUnits="userSpaceOnUse"
-    >
-      <stop stop-color="white" />
-      <stop offset="1" stop-color="white" stop-opacity="0.75" />
-    </linearGradient>
-    <linearGradient
-      id="paint1_linear_6269_3439"
-      x1="157.7"
-      y1="172.547"
-      x2="114.305"
-      y2="113.014"
-      gradientUnits="userSpaceOnUse"
-    >
-      <stop stop-color="white" stop-opacity="0.68" />
-      <stop offset="1" stop-color="white" stop-opacity="0.1" />
-    </linearGradient>
-  </defs>
-</svg>
--- a/src/configs/assets/stDYDX.ts
+++ b/src/configs/assets/stDYDX.ts
@ -1,15 +0,0 @@
-const stDYDX: AssetMetaData = {
-  symbol: 'stDYDX',
-  id: 'stDYDX',
-  name: 'Stride dYdX',
-  color: '#e50571',
-  logo: '/images/tokens/stdydx.svg',
-  decimals: 18,
-  hasOraclePrice: true,
-  isEnabled: true,
-  isMarket: true,
-  isDisplayCurrency: true,
-  isAutoLendEnabled: false,
-  isStaking: true,
-}
-export default stDYDX
--- a/src/configs/chains/osmosis/osmosis-1.ts
+++ b/src/configs/chains/osmosis/osmosis-1.ts
@ -5,24 +5,23 @@ import ATOM from 'configs/assets/ATOM'
 import AXL from 'configs/assets/AXL'
 import DYDX from 'configs/assets/DYDX'
 import INJ from 'configs/assets/INJ'
-import MARS from 'configs/assets/MARS'
-import OSMO from 'configs/assets/OSMO'
-import TIA from 'configs/assets/TIA'
-import USDC from 'configs/assets/USDC'
-import USDCaxl from 'configs/assets/USDC.axl'
-import USDT from 'configs/assets/USDT'
-import USDollar from 'configs/assets/USDollar'
-import WBTCaxl from 'configs/assets/WBTC.axl'
-import WETHaxl from 'configs/assets/WETH.xal'
 import OSMO_ATOM from 'configs/assets/lp/OSMO-ATOM'
 import OSMO_USDC from 'configs/assets/lp/OSMO_USDC'
 import OSMO_WBTC from 'configs/assets/lp/OSMO_WBTC'
 import OSMO_WETH from 'configs/assets/lp/OSMO_WETH'
 import stATOM_ATOM from 'configs/assets/lp/stATOM_ATOM'
+import MARS from 'configs/assets/MARS'
 import milkTIA from 'configs/assets/milkTIA'
+import OSMO from 'configs/assets/OSMO'
 import stATOM from 'configs/assets/stATOM'
-import stDYDX from 'configs/assets/stDYDX'
 import stOSMO from 'configs/assets/stOSMO'
+import TIA from 'configs/assets/TIA'
+import USDC from 'configs/assets/USDC'
+import USDCaxl from 'configs/assets/USDC.axl'
+import USDollar from 'configs/assets/USDollar'
+import USDT from 'configs/assets/USDT'
+import WBTCaxl from 'configs/assets/WBTC.axl'
+import WETHaxl from 'configs/assets/WETH.xal'
 import { VAULTS_META_DATA } from 'constants/vaults'
 import { NETWORK } from 'types/enums/network'
 import { ChainInfoID } from 'types/enums/wallet'
@ -46,20 +45,15 @@ const ASSETS = [
    poolId: 712,
    denom: 'ibc/D1542AA8762DB13087D8364F3EA6509FD6F009A34F00426AF9E4F9FA85CBBF1F',
  },
-  {
-    ...stATOM,
-    poolId: 803,
-    denom: 'ibc/C140AFD542AE77BD7DCC83F13FDD8C5E5BB8C4929785E6EC2F4C636F98F17901',
-  },
  {
    ...stOSMO,
    poolId: 833,
    denom: 'ibc/D176154B0C63D1F9C6DCFB4F70349EBF2E2B5A87A05902F57A6AE92B863E9AEC',
  },
  {
-    ...stDYDX,
-    poolId: 1423,
-    denom: 'ibc/980E82A9F8E7CA8CD480F4577E73682A6D3855A267D1831485D7EBEF0E7A6C2C',
+    ...stATOM,
+    poolId: 803,
+    denom: 'ibc/C140AFD542AE77BD7DCC83F13FDD8C5E5BB8C4929785E6EC2F4C636F98F17901',
  },
  {
    ...USDCaxl,
Author	SHA1	Message	Date
Linkie Link	675d4c8078	Merge branch 'develop' of https://github.com/mars-protocol/mars-v2-frontend into linkielink-patch-1 # Conflicts: # .env # .env.production # src/components/perps/BalancesTable/index.tsx	2024-02-14 19:29:07 +01:00
Linkie Link	f7b827d9ce	tidy: format	2024-02-14 19:15:17 +01:00
Linkie Link	610bd69af2	remove .env files	2024-02-14 19:14:34 +01:00
Linkie Link	953069b935	Update Dockerfile	2024-02-14 16:53:17 +01:00
Linkie Link	af478c56d5	Update .env.production	2024-02-14 16:43:57 +01:00
Bob van der Helm	a6f4c24f15	align buttons, perps row clickable (#807 ) * align buttons, perps row clickable * fix comments * update to v2.2.4 * fix borrowbutton logic, add vault deposit manage btn, fix icon size vault modal --------- Co-authored-by: Linkie Link <linkielink.dev@gmail.com>	2024-02-14 14:49:15 +01:00
Linkie Link	6946ceddfc	Portfolio fix (#809 ) * fix: fixed the portfolio account detail page layout * fix: fixed portfolio cards * tidy: refactor	2024-02-14 14:18:10 +01:00
Linkie Link	0154065ffb	env: remove env contents (#808 )	2024-02-14 12:33:10 +01:00
Linkie Link	4f64234a75	Merge branch 'main' into develop	2024-02-14 12:01:10 +01:00
Linkie Link	26f1ef4a2c	Fix docker build (#805 ) * fix: fixed the docker build * tidy: cleanup	2024-02-14 11:58:48 +01:00
Linkie Link	3f28ccd09c	feat: handle URLs with or without trailing slash (#803 ) * feat: handle URLs with or without trailing slash * tidy: cleanup slashes	2024-02-14 09:26:10 +01:00