Skip to content

Commit

Permalink
v1.7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
linkielink committed Nov 15, 2023
1 parent 0e98841 commit 3e561b0
Show file tree
Hide file tree
Showing 10 changed files with 363 additions and 29 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mars",
"homepage": "./",
"version": "1.7.2",
"version": "1.7.3",
"private": false,
"license": "SEE LICENSE IN LICENSE FILE",
"scripts": {
Expand Down
10 changes: 7 additions & 3 deletions src/components/redbank/RedbankColumns.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,17 @@
background-image: $colorGradientAXL;
}

&.juno {
background-image: $colorGradientJUNO;
&.inj {
background-image: $colorGradientINJ;
}

&.axlusdc,
&.usdc {
background-image: $colorGradientAxlUSDC;
background-image: $colorGradientUSDC;
}

&.usdt {
background-image: $colorGradientUSDT;
}

&.statom {
Expand Down
27 changes: 26 additions & 1 deletion src/configs/devnet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ import axl from 'images/axl.svg'
import axlusdc from 'images/axlusdc.svg'
import axlwbtc from 'images/axlwbtc.svg'
import axlweth from 'images/axlweth.svg'
import inj from 'images/inj.svg'
import mars from 'images/mars.svg'
import osmo from 'images/osmo.svg'
import statom from 'images/statom.svg'
import stosmo from 'images/stosmo.svg'
import tia from 'images/tia.svg'
import usdc from 'images/usdc.svg'
import usdt from 'images/usdt.svg'
import colors from 'styles/_assets.module.scss'
import { ChainInfoID } from 'types/enums/wallet'

Expand Down Expand Up @@ -84,14 +86,24 @@ const ASSETS: NetworkAssets = {
},
usdc: {
symbol: 'USDC',
name: 'USDC',
name: 'Noble',
id: 'USDC',
denom: 'ibc/498A0751C798A0D9A389AA3691123DADA57DAA4FE165D5C75894505B876BA6E4',
color: colors.usdc,
decimals: 6,
logo: usdc,
priceFeedId: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
},
usdt: {
symbol: 'USDT',
id: 'USDT',
name: 'Tether',
denom: 'ibc/4ABBEF4C8926DDDB320AE5188CFD63267ABBCEFC0583E4AE05D6E5AA2401DDAB',
color: colors.usdt,
decimals: 6,
logo: usdt,
priceFeedId: '0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b',
},
tia: {
symbol: 'TIA',
id: 'TIA',
Expand All @@ -102,6 +114,16 @@ const ASSETS: NetworkAssets = {
decimals: 6,
priceFeedId: '09f7c1d7dfbb7df2b8fe3d3d87ee94a2259d212da4f30c1f0540d066dfa44723',
},
inj: {
symbol: 'INJ',
id: 'INJ',
name: 'Injective',
denom: 'ibc/64BA6E31FE887D66C6F8F31C7B1A80C7CA179239677B4088BB55F5EA07DBE273',
logo: inj,
color: colors.inj,
decimals: 18,
priceFeedId: '0x7a5bc1d2b56ad029048cd63964b3ad2776eadf812edc1a43a31406cb54bff592',
},
stosmo: {
symbol: 'stOSMO',
id: 'stOSMO',
Expand Down Expand Up @@ -161,15 +183,18 @@ export const NETWORK_CONFIG: NetworkConfig = {
ASSETS.axlusdc,
ASSETS.axlwbtc,
ASSETS.axlweth,
ASSETS.inj,
ASSETS.statom,
ASSETS.usdc,
ASSETS.usdt,
ASSETS.tia,
ASSETS.stosmo,
],
other: [OTHER_ASSETS.usd, OTHER_ASSETS.mars],
currencies: [
OTHER_ASSETS.usd,
ASSETS.usdc,
ASSETS.usdt,
ASSETS.axlusdc,
ASSETS.osmo,
ASSETS.atom,
Expand Down
27 changes: 26 additions & 1 deletion src/configs/osmosis-1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ import axl from 'images/axl.svg'
import axlusdc from 'images/axlusdc.svg'
import axlwbtc from 'images/axlwbtc.svg'
import axlweth from 'images/axlweth.svg'
import inj from 'images/inj.svg'
import mars from 'images/mars.svg'
import osmo from 'images/osmo.svg'
import statom from 'images/statom.svg'
import stosmo from 'images/stosmo.svg'
import tia from 'images/tia.svg'
import usdc from 'images/usdc.svg'
import usdt from 'images/usdt.svg'
import colors from 'styles/_assets.module.scss'
import { ChainInfoID } from 'types/enums/wallet'

Expand Down Expand Up @@ -84,14 +86,24 @@ const ASSETS: NetworkAssets = {
},
usdc: {
symbol: 'USDC',
name: 'USDC',
name: 'Noble',
id: 'USDC',
denom: 'ibc/498A0751C798A0D9A389AA3691123DADA57DAA4FE165D5C75894505B876BA6E4',
color: colors.usdc,
decimals: 6,
logo: usdc,
priceFeedId: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
},
usdt: {
symbol: 'USDT',
id: 'USDT',
name: 'Tether',
denom: 'ibc/4ABBEF4C8926DDDB320AE5188CFD63267ABBCEFC0583E4AE05D6E5AA2401DDAB',
color: colors.usdt,
decimals: 6,
logo: usdt,
priceFeedId: '0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b',
},
tia: {
symbol: 'TIA',
id: 'TIA',
Expand All @@ -102,6 +114,16 @@ const ASSETS: NetworkAssets = {
decimals: 6,
priceFeedId: '09f7c1d7dfbb7df2b8fe3d3d87ee94a2259d212da4f30c1f0540d066dfa44723',
},
inj: {
symbol: 'INJ',
id: 'INJ',
name: 'Injective',
denom: 'ibc/64BA6E31FE887D66C6F8F31C7B1A80C7CA179239677B4088BB55F5EA07DBE273',
logo: inj,
color: colors.inj,
decimals: 18,
priceFeedId: '0x7a5bc1d2b56ad029048cd63964b3ad2776eadf812edc1a43a31406cb54bff592',
},
stosmo: {
symbol: 'stOSMO',
id: 'stOSMO',
Expand Down Expand Up @@ -163,15 +185,18 @@ export const NETWORK_CONFIG: NetworkConfig = {
ASSETS.axlusdc,
ASSETS.axlwbtc,
ASSETS.axlweth,
ASSETS.inj,
ASSETS.statom,
ASSETS.usdc,
ASSETS.usdt,
ASSETS.tia,
ASSETS.stosmo,
],
other: [OTHER_ASSETS.usd, OTHER_ASSETS.mars],
currencies: [
OTHER_ASSETS.usd,
ASSETS.usdc,
ASSETS.usdt,
ASSETS.axlusdc,
ASSETS.osmo,
ASSETS.atom,
Expand Down
6 changes: 4 additions & 2 deletions src/hooks/queries/useDepositAndDebt.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ export interface DepositAndDebtData {
ASTRODebt: string
AXLDeposits: string
AXLDebt: string
JUNODeposits: string
JUNODebt: string
INJDeposits: string
INJDebt: string
axlUSDCDeposits: string
axlUSDCDebt: string
USDCDeposits: string
USDCDebt: string
USDTDeposits: string
USDTDebt: string
axlWBTCDeposits: string
axlWBTCDebt: string
axlWETHDeposits: string
Expand Down
3 changes: 2 additions & 1 deletion src/styles/_assets.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
atom: $colorTokenATOM;
axl: $colorTokenAXL;
usdc: $colorTokenUSDC;
usdc: $colorTokenUSDT;
astro: $colorTokenASTRO;
wbtc: $colorTokenWBTC;
weth: $colorTokenWETH;
juno: $colorTokenJUNO;
inj: $colorTokenINJ;
statom: $colorTokenStATOM;
ntrn: $colorTokenNTRN;
tia: $colorTokenTIA;
Expand Down
8 changes: 5 additions & 3 deletions src/styles/_master.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ $colorTokenOSMO: #9f1ab9;
$colorTokenATOM: #6f7390;
$colorTokenAXL: #ffffff;
$colorTokenUSDC: #478edc;
$colorTokenJUNO: black;
$colorTokenUSDT: #50af95;
$colorTokenINJ: #00f2fe;
$colorTokenStATOM: #e50571;
$colorTokenWBTC: #f09242;
$colorTokenWETH: #343434;
Expand All @@ -45,15 +46,16 @@ $colorTokenTIA: #8623ff;

$colorGradientOSMO: linear-gradient(to bottom, #3a02e2, #e700ca);
$colorGradientATOM: linear-gradient(to bottom, #2e3148, #6f7390);
$colorGradientJUNO: linear-gradient(to bottom, #000000, #333333);
$colorGradientINJ: linear-gradient(to bottom, #0082fa, #00f2fe);
$colorGradientAXL: linear-gradient(to bottom, #ffffff, #999999);
$colorGradientAxlUSDC: linear-gradient(to bottom, #1f5c9e, #478edc);
$colorGradientUSDC: linear-gradient(to bottom, #1f5c9e, #478edc);
$colorGradientAxlWBTC: linear-gradient(to bottom, #f09242, #f9d3b3);
$colorGradientAxlWETH: linear-gradient(to bottom, #343434, #8c8c8c);
$colorGradientStATOM: linear-gradient(to bottom, #e50571, #fb5da9);
$colorGradientNTRN: linear-gradient(to bottom, #284fe0, #31d99c);
$colorGradientStOSMO: linear-gradient(to bottom, #e50571, #fb5da9);
$colorGradientTIA: linear-gradient(to bottom, #8623ff, #cfa7ff);
$colorGradientUSDT: linear-gradient(to bottom, #50af95, #b9dfd5);

/* Alpha Colors */
$alphaWhite10: rgba(255, 255, 255, 0.1);
Expand Down
6 changes: 4 additions & 2 deletions src/types/interfaces/asset.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ interface Asset {
| 'ATOM'
| 'ASTRO'
| 'AXL'
| 'JUNO'
| 'INJ'
| 'USDC.axl'
| 'USDC'
| 'USDT'
| 'stATOM'
| 'WBTC.axl'
| 'WETH.axl'
Expand All @@ -21,12 +22,13 @@ interface Asset {
| 'NTRN'
| 'axlUSDC'
| 'USDC'
| 'USDT'
| 'axlWBTC'
| 'axlWETH'
| 'ATOM'
| 'ASTRO'
| 'AXL'
| 'JUNO'
| 'INJ'
| 'stATOM'
| 'TIA'
| 'stOSMO'
Expand Down
6 changes: 4 additions & 2 deletions src/types/interfaces/redbank.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ interface RedBankData {
ATOMMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
AXLMarket: Market
AXLMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
JUNOMarket: Market
JUNOMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
INJMarket: Market
INJMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
ASTROMarket: Market
ASTROMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
axlUSDCMarket: Market
Expand All @@ -23,6 +23,8 @@ interface RedBankData {
stATOMMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
USDCMarket: Market
USDCMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
USDTMarket: Market
USDTMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
NTRNMarket: Market
NTRNMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
TIAMarket: Market
Expand Down
Loading

0 comments on commit 3e561b0

Please sign in to comment.