Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multi trellofixes1226 #1

Open
wants to merge 3 commits into
base: multi
Choose a base branch
from
Open

Multi trellofixes1226 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9935660
trello card 294 295 247 simple wording change
Dec 26, 2021
f30aa39
add back production env
Dec 26, 2021
3be83f6
reverted to normal yarn.lock file
Dec 26, 2021
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
7 changes: 5 additions & 2 deletions public/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,11 @@
"farms": "Farms",
"swapTip": "If the liquidity of the target chain is insufficient, you will receive {{symbol}} ({{chainName}}), please check the balance in the liquidity pool and redeem {{symbol1}}({{chainName}}).",
"approveTip": "Please approve {{symbol}} before you continue cross chain swap in Multichain router.",
"txnsTip": "Please wait minutes to check the cross-chain tx status on the explorer",
"txnsTip": "Please allow 3-30 minutes for the cross-chain transaction to complete. You may check the status on our explorer",
"ExceedLimit": "Exceed limit",
"LessThanLimit": "Less than minimum amount",
"MoreThanLimit": "More than maximum amount",

"nodestlr": "Dest Liquidity Insufficient",
"destTS": "Dest Liquidity",
"StakingTip": "Stake {{symbol}}, APR:",
Expand All @@ -355,7 +358,7 @@
"receiveTip": "Please do NOT send funds to exchanges.",
"support": "Support",
"ConnectTerraStation": "Connect Terra Station",
"topTip": "Multichain is formerly known as Anyswap",
"topTip": "Multichain is previously known as Anyswap",
"approvedTip": "{{symbol}} approved, you can continue the cross chain transaction",
"SourceChain": "Source Chain",
"Address": "Address"
Expand Down
4 changes: 2 additions & 2 deletions src/components/CrossChainPanelV2/crossChainEVM.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,12 +363,12 @@ export default function CrossChain({
} else if (Number(inputBridgeValue) < Number(destConfig.MinimumSwap)) {
return {
state: 'Error',
tip: t('ExceedLimit')
tip: t('LessThanLimit')
}
} else if (Number(inputBridgeValue) > Number(destConfig.MaximumSwap)) {
return {
state: 'Error',
tip: t('ExceedLimit')
tip: t('MoreThanLimit')
}
} else if (
(isDestUnderlying && destChain && Number(inputBridgeValue) > Number(destChain.ts))
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/URLWarning.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const PhishAlert = styled.div<{ isActive: any }>`
padding: 6px 6px;
background-color: #fdf6ec;
color: #062536;
font-size: 11px;
font-size: 14px;
justify-content: center;
align-items: center;
display: ${({ isActive }) => (isActive ? 'flex' : 'none')};
Expand Down