Skip to content
This repository has been archived by the owner on Apr 14, 2023. It is now read-only.

new release v0.4.4 #175

Merged
merged 25 commits into from
Mar 2, 2022
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
fd5f48c
chore: adding osmosis chain (#166)
canhtrinh Feb 23, 2022
686491b
chore: fixing dependencies
canhtrinh Feb 23, 2022
8a87bbf
chore: adding osmosis testnet configs (#169)
canhtrinh Feb 23, 2022
0220689
chore: updating osmosis name for testnet
canhtrinh Feb 23, 2022
9bf97a5
chore: bumping sdk version to 0.4.11
canhtrinh Feb 24, 2022
98db1eb
chore: adding usdc.fake to wallet configs for axelar and osmosis
canhtrinh Feb 24, 2022
2329b2b
chore: updating in-app deposits for osmosis
canhtrinh Feb 24, 2022
8ce617f
chore: code cleanup
canhtrinh Feb 24, 2022
134d11f
chore: updating top flows with usdc-fake, removing ftm, removing sign…
canhtrinh Feb 25, 2022
854cab7
chore: typo in environment toggle
canhtrinh Feb 25, 2022
f5f0af7
chore: making testnet env more clear
canhtrinh Feb 25, 2022
7e5120e
chore: bumping sdk version
canhtrinh Feb 25, 2022
27a25e3
chore: disabling osmosis
canhtrinh Feb 25, 2022
4035457
chore: enabling osmosis in testnet
canhtrinh Feb 26, 2022
d07d777
chore: updating configs for new osmosis-2 chain in testnet
canhtrinh Feb 27, 2022
dfc6931
chore: locking sdk version
canhtrinh Feb 27, 2022
46d4867
chore: updating denom map for uusdc
canhtrinh Feb 27, 2022
f5ff169
Feat/add confirm button (#168)
npty Feb 28, 2022
fd8b060
fix: restricting users from being able to change anything before sign…
canhtrinh Mar 1, 2022
f2499a0
fix: merge conflicts for main back to develop
canhtrinh Mar 1, 2022
c180f36
chore: updating satellite to open link to deposit confirmation tool (…
canhtrinh Mar 1, 2022
300811e
chore: updating landing page and support links to new zendesk system
canhtrinh Mar 2, 2022
6b708ce
chore: changing error logs to info logs
canhtrinh Mar 2, 2022
59eea6c
fix: fixing logic that filters out fantom in lower environments
canhtrinh Mar 2, 2022
156133a
chore: adding canh-testing CI
canhtrinh Mar 2, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
734 changes: 238 additions & 496 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@axelar-network/axelarjs-ui",
"version": "0.4.3",
"version": "0.4.4",
"private": true,
"dependencies": {
"@axelar-network/axelarjs-sdk": "0.4.8",
"@axelar-network/axelarjs-sdk": "0.4.14",
"@cosmjs/launchpad": "^0.26.5",
"@cosmjs/stargate": "^0.26.5",
"@keplr-wallet/cosmos": "0.9.9",
Expand Down
21 changes: 21 additions & 0 deletions src/api/ConfirmDepositAPI.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { AXELAR_API } from "config/env"
import { getTokenDenomForAxelarChain } from "config/token"
import { ConfirmDepositRequest } from "interface/confirmDepositTypes"

// We don't actually use it in the api server because every signer will use the same axelar account to sign transaction.
const mockSignature =
"0x11ee4e3ff6a5fbd800abc8fbceed54a75002c37ec9312a3c72b6171627b7842125ff38259fe8f00b4e9de5c60aa7ec0ec8bb820bef93408d5bd42c812e6750d21c"

export function confirmDeposit(req: ConfirmDepositRequest) {
req.token = getTokenDenomForAxelarChain(req.token)
req.signature = req.signature || mockSignature
return fetch(AXELAR_API + "/confirm_deposit_tx", {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(req),
})
.then((res) => res.json())
.then((res) => res.data.base64Tx)
}
222 changes: 222 additions & 0 deletions src/assets/svg/logos/OSMO.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions src/assets/svg/tokenAssets/uusdc.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 14 additions & 3 deletions src/components/CompositeComponents/PageHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,19 @@ const PageHeader = () => {
</div>
)
}

const pillStyle =
process.env.REACT_APP_STAGE === "mainnet"
? { color: `green`, fontSize: `smaller`, fontWeight: `bolder` }
: {
color: `white`,
fontSize: `smaller`,
fontWeight: `bolder`,
backgroundColor: `red`,
padding: `0.2em`,
borderRadius: `10px`
}

return (
<StyledPageHeader>
<HeaderText>
Expand Down Expand Up @@ -132,9 +145,7 @@ const PageHeader = () => {
</div>
</>
{HeaderDivider()}
<div
style={{ color: `green`, fontSize: `smaller`, fontWeight: `bolder` }}
>
<div style={pillStyle}>
{(process.env.REACT_APP_STAGE || "").toUpperCase()}
</div>
{HeaderDivider()}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ export const SelectedChainLogoAndText = (props: IChainComponentProps) => {
} catch (e) {
image = require(`assets/svg/select-chain-eye.svg`)?.default
}
const label = props.chainInfo?.chainName?.toLowerCase() === "osmosis-2" ? "Osmosis" : props.chainInfo?.chainName
return (
<BaseSelector
image={<SVGImage height={`1.5em`} width={`1.5em`} src={image} />}
label={props.chainInfo?.chainName || "Select Chain"}
label={label || "Select Chain"}
/>
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const ChainSelector = React.forwardRef((props: IChainSelectorProps, ref) => {
}
const chainDropdownOptions: ISearchItem[] = filteredChainList.map(
(supportedChain: ChainInfo) => ({
title: supportedChain.chainName,
title: supportedChain?.chainName?.toLowerCase() === "osmosis-2" ? "Osmosis" : supportedChain.chainName,
active: false,
icon: require(`assets/svg/logos/${supportedChain?.chainSymbol}.svg`)
?.default,
Expand Down
2 changes: 2 additions & 0 deletions src/components/Widgets/Mask.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ export const Mask = styled.div<IMaskProps>`
position: absolute;
width: 100%;
height: 100%;
z-index: 10000;
background-color: rgba(0,0,0,0.25);
${(props) => (props.centered ? `${StyledCentered}` : null)}
`
4 changes: 4 additions & 0 deletions src/config/consts.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
export const SOURCE_TOKEN_KEY: string = "first-chain-selection"
export const DESTINATION_TOKEN_KEY: string = "second-chain-selection"
export const MS_UNTIL_CONFIRM_BTN_VISIBLE: number = parseInt(
process.env.REACT_APP_MS_UNTIL_CONFIRM_BTN_VISIBLE ||
(5 * 60 * 1000).toString()
) // 5 mins
Loading