Skip to content

Commit

Permalink
Merge branch 'develop' into dawn
Browse files Browse the repository at this point in the history
* develop:
  linting, formatting
  • Loading branch information
steezeburger committed Oct 29, 2024
2 parents 9a9def1 + 55b7644 commit 5a18f94
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
12 changes: 2 additions & 10 deletions web/src/components/Navbar/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,10 @@ function Navbar() {
<Link to="/" className="navbar-item is-active">
BRIDGE
</Link>
<a
href={swapURL}
className="navbar-item"
rel="noreferrer"
>
<a href={swapURL} className="navbar-item" rel="noreferrer">
SWAP
</a>
<a
href={poolURL}
className="navbar-item"
rel="noreferrer"
>
<a href={poolURL} className="navbar-item" rel="noreferrer">
POOL
</a>
</div>
Expand Down
12 changes: 8 additions & 4 deletions web/src/config/chainConfigs/ChainConfigsMainnet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@ const OsmosisChainInfo: IbcChainInfo = {
rest: "https://osmosis-api.polkachu.com/",
stakeCurrency: {
coinDenom: "milkTIA",
coinMinimalDenom: "factory/osmo1f5vfcph2dvfeqcqkhetwv75fda69z7e5c2dldm3kvgj23crkv6wqcn47a0/umilkTIA",
coinMinimalDenom:
"factory/osmo1f5vfcph2dvfeqcqkhetwv75fda69z7e5c2dldm3kvgj23crkv6wqcn47a0/umilkTIA",
coinDecimals: 6,
},
bip44: {
Expand All @@ -153,7 +154,8 @@ const OsmosisChainInfo: IbcChainInfo = {
currencies: [
{
coinDenom: "milkTIA",
coinMinimalDenom: "factory/osmo1f5vfcph2dvfeqcqkhetwv75fda69z7e5c2dldm3kvgj23crkv6wqcn47a0/umilkTIA",
coinMinimalDenom:
"factory/osmo1f5vfcph2dvfeqcqkhetwv75fda69z7e5c2dldm3kvgj23crkv6wqcn47a0/umilkTIA",
coinDecimals: 6,
ibcChannel: "channel-85486",
sequencerBridgeAccount: "astria1kgxhyhvynhcwwrylkzzx6q3a8rn3tuvasxvuy8",
Expand All @@ -163,7 +165,8 @@ const OsmosisChainInfo: IbcChainInfo = {
feeCurrencies: [
{
coinDenom: "milkTIA",
coinMinimalDenom: "factory/osmo1f5vfcph2dvfeqcqkhetwv75fda69z7e5c2dldm3kvgj23crkv6wqcn47a0/umilkTIA",
coinMinimalDenom:
"factory/osmo1f5vfcph2dvfeqcqkhetwv75fda69z7e5c2dldm3kvgj23crkv6wqcn47a0/umilkTIA",
coinDecimals: 6,
gasPriceStep: {
low: 0.01,
Expand Down Expand Up @@ -252,7 +255,8 @@ const FlameChainInfo: EvmChainInfo = {
},
{
coinDenom: "milkTIA",
coinMinimalDenom: "factory/osmo1f5vfcph2dvfeqcqkhetwv75fda69z7e5c2dldm3kvgj23crkv6wqcn47a0/umilkTIA",
coinMinimalDenom:
"factory/osmo1f5vfcph2dvfeqcqkhetwv75fda69z7e5c2dldm3kvgj23crkv6wqcn47a0/umilkTIA",
coinDecimals: 18,
erc20ContractAddress: "0xcbb93e854AA4EF5Db51c3b094F28952eF0dC67bE",
ibcWithdrawalFeeWei: "10000000000000000",
Expand Down
2 changes: 1 addition & 1 deletion web/src/styles/icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@ i.i-osmosis {
background-size: contain;
height: 100%;
width: 100%;
}
}

0 comments on commit 5a18f94

Please sign in to comment.