Skip to content

Commit

Permalink
Merge branch 'style/new_bridge' into styles/approval_and_bridge
Browse files Browse the repository at this point in the history
  • Loading branch information
jinming0618 committed Dec 6, 2024
2 parents c50c73d + 77ecd9f commit 4a0ccc7
Show file tree
Hide file tree
Showing 30 changed files with 3,069 additions and 984 deletions.
20 changes: 19 additions & 1 deletion apps/mobile/src/assets/locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -938,9 +938,27 @@
}
},
"bridge": {
"showMore": {
"title": "Show More",
"source": "Bridge Source"
},
"recommendFromToken": "Bridge from <1></1> for an available quote",
"est-payment": "Est. Payment:",
"est-receiving": "Est. Receiving:",
"est-difference": "Est. Difference:",
"loss-tips": "You're losing {{usd}}. Try a different amount.",
"price-impact": "Price Impact",
"From": "From",
"bridgeFrom": "Bridge From",
"To": "To",
"Balance": "Balance: ",
"Select": "Select",
"select-chain": "Select Chain",
"no-quote-found": "No quote found. Please try other token pairs.",
"no-quote": "No Quote",
"title": "Bridge",
"history": "Bridge history",
"the-following-bridge-route-are-found": "Found following bridge route",
"the-following-bridge-route-are-found": "Found following rates",
"no-transaction-records": "No transaction records",
"pendingTip": "Tx submitted. If the tx is pending for long hours, you can try to clear pending in settings.",
"Pending": "Pending",
Expand Down
5 changes: 5 additions & 0 deletions apps/mobile/src/assets2024/icons/bridge/IcHelp.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions apps/mobile/src/assets2024/icons/bridge/IconArrowDown.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions apps/mobile/src/assets2024/icons/bridge/IconBluePolygon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions apps/mobile/src/assets2024/icons/bridge/IconLoading.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions apps/mobile/src/assets2024/icons/bridge/IconPolygon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions apps/mobile/src/assets2024/icons/bridge/IconSwitchBtn.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { replaceToFirst } from '@/utils/navigation';
import { RootNames } from '@/constant/layout';
import { KEYRING_CLASS, KEYRING_TYPE } from '@rabby-wallet/keyring-utils';
import { useCreateAddressProc } from '@/hooks/address/useNewUser';

interface Props {
onDone: () => void;
delaySetPassword?: boolean;
Expand All @@ -38,7 +37,7 @@ export const SeedPhraseBackupToCloud: React.FC<Props> = ({
seedPhrase: seedPharseData,
alias: addressList?.[0].aliasName || '',
address: addressList?.[0].address || '',
accountsToCreate: addressList,
accountsToCreate: addressList || [],
};
}, [seedPharseData, addressList]);
const { t } = useTranslation();
Expand Down Expand Up @@ -72,7 +71,7 @@ export const SeedPhraseBackupToCloud: React.FC<Props> = ({
await addKeyringAndactiveAndPersistAccounts(
mnemonics,
passphrase,
accountsToCreate as any,
accountsToCreate,
true,
);
keyringService.removePreMnemonics();
Expand Down
Loading

0 comments on commit 4a0ccc7

Please sign in to comment.