Skip to content

Commit ff0de57

Browse files
linkielinklinkielink
authored
Merge pull request #49 from mars-protocol/v1.7.3
v1.7.3
2 parents 0e98841 + 3e561b0 commit ff0de57

File tree

10 files changed

+363
-29
lines changed

10 files changed

+363
-29
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "mars",
33
"homepage": "./",
4-
"version": "1.7.2",
4+
"version": "1.7.3",
55
"private": false,
66
"license": "SEE LICENSE IN LICENSE FILE",
77
"scripts": {

‎src/components/redbank/RedbankColumns.module.scss‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,17 @@
1919
background-image: $colorGradientAXL;
2020
}
2121

22-
&.juno {
23-
background-image: $colorGradientJUNO;
22+
&.inj {
23+
background-image: $colorGradientINJ;
2424
}
2525

2626
&.axlusdc,
2727
&.usdc {
28-
background-image: $colorGradientAxlUSDC;
28+
background-image: $colorGradientUSDC;
29+
}
30+
31+
&.usdt {
32+
background-image: $colorGradientUSDT;
2933
}
3034

3135
&.statom {

‎src/configs/devnet.ts‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ import axl from 'images/axl.svg'
33
import axlusdc from 'images/axlusdc.svg'
44
import axlwbtc from 'images/axlwbtc.svg'
55
import axlweth from 'images/axlweth.svg'
6+
import inj from 'images/inj.svg'
67
import mars from 'images/mars.svg'
78
import osmo from 'images/osmo.svg'
89
import statom from 'images/statom.svg'
910
import stosmo from 'images/stosmo.svg'
1011
import tia from 'images/tia.svg'
1112
import usdc from 'images/usdc.svg'
13+
import usdt from 'images/usdt.svg'
1214
import colors from 'styles/_assets.module.scss'
1315
import { ChainInfoID } from 'types/enums/wallet'
1416

@@ -84,14 +86,24 @@ const ASSETS: NetworkAssets = {
8486
},
8587
usdc: {
8688
symbol: 'USDC',
87-
name: 'USDC',
89+
name: 'Noble',
8890
id: 'USDC',
8991
denom: 'ibc/498A0751C798A0D9A389AA3691123DADA57DAA4FE165D5C75894505B876BA6E4',
9092
color: colors.usdc,
9193
decimals: 6,
9294
logo: usdc,
9395
priceFeedId: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
9496
},
97+
usdt: {
98+
symbol: 'USDT',
99+
id: 'USDT',
100+
name: 'Tether',
101+
denom: 'ibc/4ABBEF4C8926DDDB320AE5188CFD63267ABBCEFC0583E4AE05D6E5AA2401DDAB',
102+
color: colors.usdt,
103+
decimals: 6,
104+
logo: usdt,
105+
priceFeedId: '0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b',
106+
},
95107
tia: {
96108
symbol: 'TIA',
97109
id: 'TIA',
@@ -102,6 +114,16 @@ const ASSETS: NetworkAssets = {
102114
decimals: 6,
103115
priceFeedId: '09f7c1d7dfbb7df2b8fe3d3d87ee94a2259d212da4f30c1f0540d066dfa44723',
104116
},
117+
inj: {
118+
symbol: 'INJ',
119+
id: 'INJ',
120+
name: 'Injective',
121+
denom: 'ibc/64BA6E31FE887D66C6F8F31C7B1A80C7CA179239677B4088BB55F5EA07DBE273',
122+
logo: inj,
123+
color: colors.inj,
124+
decimals: 18,
125+
priceFeedId: '0x7a5bc1d2b56ad029048cd63964b3ad2776eadf812edc1a43a31406cb54bff592',
126+
},
105127
stosmo: {
106128
symbol: 'stOSMO',
107129
id: 'stOSMO',
@@ -161,15 +183,18 @@ export const NETWORK_CONFIG: NetworkConfig = {
161183
ASSETS.axlusdc,
162184
ASSETS.axlwbtc,
163185
ASSETS.axlweth,
186+
ASSETS.inj,
164187
ASSETS.statom,
165188
ASSETS.usdc,
189+
ASSETS.usdt,
166190
ASSETS.tia,
167191
ASSETS.stosmo,
168192
],
169193
other: [OTHER_ASSETS.usd, OTHER_ASSETS.mars],
170194
currencies: [
171195
OTHER_ASSETS.usd,
172196
ASSETS.usdc,
197+
ASSETS.usdt,
173198
ASSETS.axlusdc,
174199
ASSETS.osmo,
175200
ASSETS.atom,

‎src/configs/osmosis-1.ts‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ import axl from 'images/axl.svg'
33
import axlusdc from 'images/axlusdc.svg'
44
import axlwbtc from 'images/axlwbtc.svg'
55
import axlweth from 'images/axlweth.svg'
6+
import inj from 'images/inj.svg'
67
import mars from 'images/mars.svg'
78
import osmo from 'images/osmo.svg'
89
import statom from 'images/statom.svg'
910
import stosmo from 'images/stosmo.svg'
1011
import tia from 'images/tia.svg'
1112
import usdc from 'images/usdc.svg'
13+
import usdt from 'images/usdt.svg'
1214
import colors from 'styles/_assets.module.scss'
1315
import { ChainInfoID } from 'types/enums/wallet'
1416

@@ -84,14 +86,24 @@ const ASSETS: NetworkAssets = {
8486
},
8587
usdc: {
8688
symbol: 'USDC',
87-
name: 'USDC',
89+
name: 'Noble',
8890
id: 'USDC',
8991
denom: 'ibc/498A0751C798A0D9A389AA3691123DADA57DAA4FE165D5C75894505B876BA6E4',
9092
color: colors.usdc,
9193
decimals: 6,
9294
logo: usdc,
9395
priceFeedId: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
9496
},
97+
usdt: {
98+
symbol: 'USDT',
99+
id: 'USDT',
100+
name: 'Tether',
101+
denom: 'ibc/4ABBEF4C8926DDDB320AE5188CFD63267ABBCEFC0583E4AE05D6E5AA2401DDAB',
102+
color: colors.usdt,
103+
decimals: 6,
104+
logo: usdt,
105+
priceFeedId: '0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b',
106+
},
95107
tia: {
96108
symbol: 'TIA',
97109
id: 'TIA',
@@ -102,6 +114,16 @@ const ASSETS: NetworkAssets = {
102114
decimals: 6,
103115
priceFeedId: '09f7c1d7dfbb7df2b8fe3d3d87ee94a2259d212da4f30c1f0540d066dfa44723',
104116
},
117+
inj: {
118+
symbol: 'INJ',
119+
id: 'INJ',
120+
name: 'Injective',
121+
denom: 'ibc/64BA6E31FE887D66C6F8F31C7B1A80C7CA179239677B4088BB55F5EA07DBE273',
122+
logo: inj,
123+
color: colors.inj,
124+
decimals: 18,
125+
priceFeedId: '0x7a5bc1d2b56ad029048cd63964b3ad2776eadf812edc1a43a31406cb54bff592',
126+
},
105127
stosmo: {
106128
symbol: 'stOSMO',
107129
id: 'stOSMO',
@@ -163,15 +185,18 @@ export const NETWORK_CONFIG: NetworkConfig = {
163185
ASSETS.axlusdc,
164186
ASSETS.axlwbtc,
165187
ASSETS.axlweth,
188+
ASSETS.inj,
166189
ASSETS.statom,
167190
ASSETS.usdc,
191+
ASSETS.usdt,
168192
ASSETS.tia,
169193
ASSETS.stosmo,
170194
],
171195
other: [OTHER_ASSETS.usd, OTHER_ASSETS.mars],
172196
currencies: [
173197
OTHER_ASSETS.usd,
174198
ASSETS.usdc,
199+
ASSETS.usdt,
175200
ASSETS.axlusdc,
176201
ASSETS.osmo,
177202
ASSETS.atom,

‎src/hooks/queries/useDepositAndDebt.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ export interface DepositAndDebtData {
1515
ASTRODebt: string
1616
AXLDeposits: string
1717
AXLDebt: string
18-
JUNODeposits: string
19-
JUNODebt: string
18+
INJDeposits: string
19+
INJDebt: string
2020
axlUSDCDeposits: string
2121
axlUSDCDebt: string
2222
USDCDeposits: string
2323
USDCDebt: string
24+
USDTDeposits: string
25+
USDTDebt: string
2426
axlWBTCDeposits: string
2527
axlWBTCDebt: string
2628
axlWETHDeposits: string

‎src/styles/_assets.module.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
atom: $colorTokenATOM;
88
axl: $colorTokenAXL;
99
usdc: $colorTokenUSDC;
10+
usdc: $colorTokenUSDT;
1011
astro: $colorTokenASTRO;
1112
wbtc: $colorTokenWBTC;
1213
weth: $colorTokenWETH;
13-
juno: $colorTokenJUNO;
14+
inj: $colorTokenINJ;
1415
statom: $colorTokenStATOM;
1516
ntrn: $colorTokenNTRN;
1617
tia: $colorTokenTIA;

‎src/styles/_master.scss‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ $colorTokenOSMO: #9f1ab9;
3434
$colorTokenATOM: #6f7390;
3535
$colorTokenAXL: #ffffff;
3636
$colorTokenUSDC: #478edc;
37-
$colorTokenJUNO: black;
37+
$colorTokenUSDT: #50af95;
38+
$colorTokenINJ: #00f2fe;
3839
$colorTokenStATOM: #e50571;
3940
$colorTokenWBTC: #f09242;
4041
$colorTokenWETH: #343434;
@@ -45,15 +46,16 @@ $colorTokenTIA: #8623ff;
4546

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

5860
/* Alpha Colors */
5961
$alphaWhite10: rgba(255, 255, 255, 0.1);

‎src/types/interfaces/asset.d.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ interface Asset {
88
| 'ATOM'
99
| 'ASTRO'
1010
| 'AXL'
11-
| 'JUNO'
11+
| 'INJ'
1212
| 'USDC.axl'
1313
| 'USDC'
14+
| 'USDT'
1415
| 'stATOM'
1516
| 'WBTC.axl'
1617
| 'WETH.axl'
@@ -21,12 +22,13 @@ interface Asset {
2122
| 'NTRN'
2223
| 'axlUSDC'
2324
| 'USDC'
25+
| 'USDT'
2426
| 'axlWBTC'
2527
| 'axlWETH'
2628
| 'ATOM'
2729
| 'ASTRO'
2830
| 'AXL'
29-
| 'JUNO'
31+
| 'INJ'
3032
| 'stATOM'
3133
| 'TIA'
3234
| 'stOSMO'

‎src/types/interfaces/redbank.d.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ interface RedBankData {
99
ATOMMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
1010
AXLMarket: Market
1111
AXLMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
12-
JUNOMarket: Market
13-
JUNOMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
12+
INJMarket: Market
13+
INJMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
1414
ASTROMarket: Market
1515
ASTROMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
1616
axlUSDCMarket: Market
@@ -23,6 +23,8 @@ interface RedBankData {
2323
stATOMMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
2424
USDCMarket: Market
2525
USDCMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
26+
USDTMarket: Market
27+
USDTMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
2628
NTRNMarket: Market
2729
NTRNMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
2830
TIAMarket: Market

0 commit comments

Comments
 (0)