Skip to content

Commit

Permalink
Merge pull request #13146 from brave/feat-onboarding-next
Browse files Browse the repository at this point in the history 
feat: Onboarding redesign
  • Loading branch information
@josheleonard
josheleonard authored Aug 12, 2022
2 parents ed60375 + 10651b4 commit 8c970d8
Show file tree
Hide file tree
Showing 188 changed files with 8,415 additions and 2,315 deletions.
6 changes: 0 additions & 6 deletions components/brave_wallet/browser/brave_wallet_constants.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ const std::vector<mojom::BlockchainToken>& GetWyreBuyTokens() {
{"0x0D8775F648430679A709E98d2b0Cb6250d2887EF", "Basic Attention Token",
"bat.png", true, false, "BAT", 18, true, "", "", mojom::kMainnetChainId,
mojom::CoinType::ETH},
{"0x4829043Fc625FdA139523b2ceB99D95354e2b359", "Avalanche C-Chain",
"avax.png", true, false, "AVAXC", 18, true, "", "",
mojom::kAvalancheMainnetChainId, mojom::CoinType::ETH},
{"", "Ethereum", "", false, false, "ETH", 18, true, "", "",
mojom::kMainnetChainId, mojom::CoinType::ETH},
{"0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", "USD Coin", "usdc.png",
Expand Down Expand Up @@ -104,9 +101,6 @@ const std::vector<mojom::BlockchainToken>& GetRampBuyTokens() {
mojom::kBinanceSmartChainMainnetChainId, mojom::CoinType::ETH},
{"", "Avalanche", "", false, false, "AVAX", 18, true, "", "",
mojom::kAvalancheMainnetChainId, mojom::CoinType::ETH},
{"0x82030cdbd9e4b7c5bb0b811a61da6360d69449cc", "RealFevr", "", true,
false, "FEVR", 18, true, "", "",
mojom::kBinanceSmartChainMainnetChainId, mojom::CoinType::ETH},
{"", "Filecoin", "", false, false, "FIL", 18, true, "", "",
mojom::kFilecoinMainnet, mojom::CoinType::FIL},
{"", "Celo", "", false, false, "CELO", 18, true, "", "",
Expand Down
124 changes: 103 additions & 21 deletions components/brave_wallet/browser/brave_wallet_constants.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ constexpr char kSardineClientTokensURL[] =

constexpr webui::LocalizedString kLocalizedStrings[] = {
{"braveWalletEnterYourPassword", IDS_BRAVE_WALLET_ENTER_YOUR_PASSWORD},
{"braveWalletClickToSwitch", BRAVE_WALLET_CLICK_TO_SWITCH},
{"braveWalletUnlockNeededToCreateAccount",
BRAVE_WALLET_UNLOCK_NEEDED_TO_CREATE_ACCOUNT},
{"braveWalletMultiChain", BRAVE_WALLET_MULTI_CHAIN},
{"braveWalletPerksBrowserNative", BRAVE_WALLET_PERKS_BROWSER_NATIVE},
{"braveWalletPerksTokens", BRAVE_WALLET_PERKS_TOKENS},
{"braveWallet", IDS_BRAVE_WALLET},
{"braveWalletDefiCategory", IDS_BRAVE_WALLET_DEFI_CATEGORY},
{"braveWalletNftCategory", IDS_BRAVE_WALLET_NFT_CATEGORY},
Expand Down Expand Up @@ -111,20 +117,25 @@ constexpr webui::LocalizedString kLocalizedStrings[] = {
{"braveWalletCreateAccountYes", IDS_BRAVE_WALLET_CREATE_ACCOUNT_YES},
{"braveWalletCreateAccountNo", IDS_BRAVE_WALLET_CREATE_ACCOUNT_NO},
{"braveWalletButtonContinue", IDS_BRAVE_WALLET_BUTTON_CONTINUE},
{"braveWalletButtonNext", IDS_BRAVE_WALLET_BUTTON_NEXT},
{"braveWalletButtonGotIt", IDS_BRAVE_WALLET_BUTTON_GOT_IT},
{"braveWalletButtonCopy", IDS_BRAVE_WALLET_BUTTON_COPY},
{"braveWalletButtonCopied", IDS_BRAVE_WALLET_BUTTON_COPIED},
{"braveWalletButtonVerify", IDS_BRAVE_WALLET_BUTTON_VERIFY},
{"braveWalletButtonClose", IDS_BRAVE_WALLET_BUTTON_CLOSE},
{"braveWalletButtonMore", IDS_BRAVE_WALLET_BUTTON_MORE},
{"braveWalletButtonDone", IDS_BRAVE_WALLET_BUTTON_DONE},
{"braveWalletWelcomeTitle", IDS_BRAVE_WALLET_WELCOME_TITLE},
{"braveWalletWelcomeDescription", IDS_BRAVE_WALLET_WELCOME_DESCRIPTION},
{"braveWalletWelcomeButton", IDS_BRAVE_WALLET_WELCOME_BUTTON},
{"braveWalletWelcomeRestoreButton",
IDS_BRAVE_WALLET_WELCOME_RESTORE_BUTTON},
{"braveWalletImportExistingWallet", BRAVE_WALLET_IMPORT_EXISTING_WALLET},
{"braveWalletBackupIntroTitle", IDS_BRAVE_WALLET_BACKUP_INTRO_TITLE},
{"braveWalletBackupIntroDescription",
IDS_BRAVE_WALLET_BACKUP_INTRO_DESCRIPTION},
{"braveWalletBackupIntroTerms", IDS_BRAVE_WALLET_BACKUP_INTRO_TERMS},
{"braveWalletBackupButtonSkip", IDS_BRAVE_WALLET_BACKUP_BUTTON_SKIP},
{"braveWalletBackupButtonCancel", IDS_BRAVE_WALLET_BACKUP_BUTTON_CANCEL},
{"braveWalletButtonSkip", IDS_BRAVE_WALLET_BUTTON_SKIP},
{"braveWalletButtonCancel", IDS_BRAVE_WALLET_BUTTON_CANCEL},
{"braveWalletRecoveryTitle", IDS_BRAVE_WALLET_RECOVERY_TITLE},
{"braveWalletRecoveryDescription", IDS_BRAVE_WALLET_RECOVERY_DESCRIPTION},
{"braveWalletRecoveryWarning1", IDS_BRAVE_WALLET_RECOVERY_WARNING1},
Expand All @@ -135,6 +146,11 @@ constexpr webui::LocalizedString kLocalizedStrings[] = {
{"braveWalletVerifyRecoveryDescription",
IDS_BRAVE_WALLET_VERIFY_RECOVERY_DESCRIPTION},
{"braveWalletVerifyError", IDS_BRAVE_WALLET_VERIFY_ERROR},
{"braveWalletVerifyRecoveryPhraseTitle",
IDS_BRAVE_WALLET_VERIFY_RECOVERY_PHRASE_TITLE},
{"braveWalletVerifyRecoveryPhraseInstructions",
IDS_BRAVE_WALLET_VERIFY_RECOVERY_PHRASE_INSTRUCTIONS},
{"braveWalletVerifyPhraseError", IDS_BRAVE_WALLET_VERIFY_PHRASE_ERROR},
{"braveWalletCreatePasswordTitle", IDS_BRAVE_WALLET_CREATE_PASSWORD_TITLE},
{"braveWalletCreatePasswordDescription",
IDS_BRAVE_WALLET_CREATE_PASSWORD_DESCRIPTION},
Expand Down Expand Up @@ -168,6 +184,7 @@ constexpr webui::LocalizedString kLocalizedStrings[] = {
IDS_BRAVE_WALLET_TOOL_TIP_COPY_TO_CLIPBOARD},
{"braveWalletToolTipCopiedToClipboard",
IDS_BRAVE_WALLET_TOOL_TIP_COPIED_TO_CLIPBOARD},
{"braveWalletPasteFromClipboard", IDS_BRAVE_WALLET_PASTE_FROM_CLIPBOARD},
{"braveWalletAccountsPrimary", IDS_BRAVE_WALLET_ACCOUNTS_PRIMARY},
{"braveWalletAccountsPrimaryDisclaimer",
IDS_BRAVE_WALLET_ACCOUNTS_PRIMARY_DISCLAIMER},
Expand Down Expand Up @@ -430,7 +447,7 @@ constexpr webui::LocalizedString kLocalizedStrings[] = {
{"braveWalletPanelBlocked", IDS_BRAVE_WALLET_PANEL_BLOCKED},
{"braveWalletWelcomePanelDescription",
IDS_BRAVE_WALLET_WELCOME_PANEL_DESCRIPTION},
{"braveWalletWelcomePanelButton", IDS_BRAVE_WALLET_WELCOME_PANEL_BUTTON},
{"braveWalletLearnMore", IDS_BRAVE_WALLET_LEARN_MORE},
{"braveWalletTransactionDetailBoxFunction",
IDS_BRAVE_WALLET_TRANSACTION_DETAIL_BOX_FUNCTION},
{"braveWalletTransactionDetailBoxHex",
Expand All @@ -444,30 +461,14 @@ constexpr webui::LocalizedString kLocalizedStrings[] = {
{"braveWalletConnectWithSiteNext", IDS_BRAVE_WALLET_CONNECT_WITH_SITE_NEXT},
{"braveWalletConnectWithSiteHeaderTitle",
IDS_BRAVE_WALLET_CONNECT_WITH_SITE_HEADER_TITLE},
{"braveWalletImportFromExternalNewPassword",
IDS_BRAVE_WALLET_IMPORT_FROM_EXTERNAL_NEW_PASSWORD},
{"braveWalletImportFromExternalCreatePassword",
IDS_BRAVE_WALLET_IMPORT_FROM_EXTERNAL_CREATE_PASSWORD},
{"braveWalletImportFromExternalPasswordCheck",
IDS_BRAVE_WALLET_IMPORT_FROM_EXTERNAL_PASSWORD_CHECK},
{"braveWalletImportMetaMaskTitle", IDS_BRAVE_WALLET_IMPORT_META_MASK_TITLE},
{"braveWalletImportTitle", IDS_BRAVE_WALLET_IMPORT_TITLE},
{"braveWalletImportDescription", IDS_BRAVE_WALLET_IMPORT_DESCRIPTION},
{"braveWalletImportMetaMaskInput", IDS_BRAVE_WALLET_IMPORT_META_MASK_INPUT},
{"braveWalletImportBraveLegacyTitle",
IDS_BRAVE_WALLET_IMPORT_BRAVE_LEGACY_TITLE},
{"braveWalletCryptoWalletsDetected",
IDS_BRAVE_WALLET_CRYPTO_WALLETS_DETECTED},
{"braveWalletCryptoWalletsDescriptionOne",
IDS_BRAVE_WALLET_CRYPTO_WALLETS_DESCRIPTION_ONE},
{"braveWalletCryptoWalletsDescriptionTwo",
IDS_BRAVE_WALLET_CRYPTO_WALLETS_DESCRIPTION_TWO},
{"braveWalletImportBraveLegacyDescription",
IDS_BRAVE_WALLET_IMPORT_BRAVE_LEGACY_DESCRIPTION},
{"braveWalletImportBraveLegacyInput",
IDS_BRAVE_WALLET_IMPORT_BRAVE_LEGACY_INPUT},
{"braveWalletImportBraveLegacyAltButton",
IDS_BRAVE_WALLET_IMPORT_BRAVE_LEGACY_ALT_BUTTON},
{"braveWalletConnectHardwarePanelConnected",
IDS_BRAVE_WALLET_CONNECT_HARDWARE_PANEL_CONNECTED},
{"braveWalletConnectHardwarePanelDisconnected",
Expand Down Expand Up @@ -689,7 +690,88 @@ constexpr webui::LocalizedString kLocalizedStrings[] = {
{"braveWalletAuroraModalLearnMore",
IDS_BRAVE_WALLET_AURORA_MODAL_LEARN_MORE},
{"braveWalletAuroraModalOPenButtonText",
IDS_BRAVE_WALLET_AURORA_MODAL_OPEN_BUTTON_TEXT}};
IDS_BRAVE_WALLET_AURORA_MODAL_OPEN_BUTTON_TEXT},
{"braveWalletPasswordStrengthTooltipHeading",
IDS_BRAVE_WALLET_PASSWORD_STRENGTH_TOOLTIP_HEADING},
{"braveWalletPasswordStrengthTooltipIsLongEnough",
IDS_BRAVE_WALLET_PASSWORD_STRENGTH_TOOLTIP_IS_LONG_ENOUGH},
{"braveWalletPasswordMatch", IDS_BRAVE_WALLET_PASSWORD_MATCH},
{"braveWalletPasswordIsStrong", IDS_BRAVE_WALLET_PASSWORD_IS_STRONG},
{"braveWalletPasswordIsMediumStrength",
IDS_BRAVE_WALLET_PASSWORD_IS_MEDIUM_STRENGTH},
{"braveWalletPasswordIsWeak", IDS_BRAVE_WALLET_PASSWORD_IS_WEAK},
{"braveWalletOnboardingRecoveryPhraseBackupIntroTitle",
IDS_BRAVE_WALLET_ONBOARDING_RECOVERY_PHRASE_BACKUP_INTRO_TITLE},
{"braveWalletOnboardingRecoveryPhraseBackupIntroDescription",
IDS_BRAVE_WALLET_ONBOARDING_RECOVERY_PHRASE_BACKUP_INTRO_DESCRIPTION},
{"braveWalletRecoveryPhraseBackupWarning",
IDS_BRAVE_WALLET_RECOVERY_PHRASE_BACKUP_WARNING},
{"braveWalletRecoveryPhraseBackupWarningImportant",
IDS_BRAVE_WALLET_RECOVERY_PHRASE_BACKUP_WARNING_IMPORTANT},
{"braveWalletRecoveryPhraseBackupTitle",
IDS_BRAVE_WALLET_RECOVERY_PHRASE_BACKUP_TITLE},
{"braveWalletCopiedToClipboard", IDS_BRAVE_WALLET_COPIED_TO_CLIPBOARD},
{"braveWalletClickToSeeRecoveryPhrase",
IDS_BRAVE_WALLET_CLICK_TO_SEE_RECOVERY_PHRASE},
{"braveWalletOrdinalFirst", IDS_BRAVE_WALLET_ORDINAL_FIRST},
{"braveWalletOrdinalThird", IDS_BRAVE_WALLET_ORDINAL_THIRD},
{"braveWalletOrdinalLast", IDS_BRAVE_WALLET_ORDINAL_LAST},
{"braveWalletOnboardingSuccessTitle",
IDS_BRAVE_WALLET_ONBOARDING_SUCCESS_TITLE},
{"braveWalletOnboardingSuccessDescription",
IDS_BRAVE_WALLET_ONBOARDING_SUCCESS_DESCRIPTION},
{"braveWalletArticleLinkWhatsARecoveryPhrase",
IDS_BRAVE_WALLET_ARTICLE_LINK_WHATS_A_RECOVERY_PHRASE},
{"braveWalletImportOrRestoreWalletTitle",
IDS_BRAVE_WALLET_IMPORT_OR_RESTORE_WALLET_TITLE},
{"braveWalletImportOrRestoreDescription",
IDS_BRAVE_WALLET_IMPORT_OR_RESTORE_DESCRIPTION},
{"braveWalletRestoreMyBraveWallet",
IDS_BRAVE_WALLET_RESTORE_MY_BRAVE_WALLET},
{"braveWalletRestoreMyBraveWalletInstructions",
IDS_BRAVE_WALLET_RESTORE_MY_BRAVE_WALLET_INSTRUCTIONS},
{"braveWalletRestoreMyBraveWalletDescription",
IDS_BRAVE_WALLET_RESTORE_MY_BRAVE_WALLET_DESCRIPTION},
{"braveWalletImportFromMetaMask", IDS_BRAVE_WALLET_IMPORT_FROM_META_MASK},
{"braveWalletImportFromMetaMaskDescription",
IDS_BRAVE_WALLET_IMPORT_FROM_META_MASK_DESCRIPTION},
{"braveWalletImportFromMetaMaskSeedInstructions",
IDS_BRAVE_WALLET_IMPORT_FROM_META_MASK_SEED_INSTRUCTIONS},
{"braveWalletCreateWalletInsteadLink",
IDS_BRAVE_WALLET_CREATE_WALLET_INSTEAD_LINK},
{"braveWalletImportPasswordError", IDS_BRAVE_WALLET_IMPORT_PASSWORD_ERROR},
{"braveWalletMetaMaskExtensionDetected",
IDS_BRAVE_WALLET_METAMASK_EXTENSION_DETECTED},
{"braveWalletMetaMaskExtensionImportDescription",
IDS_BRAVE_WALLET_METAMASK_EXTENSION_IMPORT_DESCRIPTION},
{"braveWalletMetaMaskPasswordInputPlaceholder",
IDS_BRAVE_WALLET_METAMASK_PASSWORD_INPUT_PLACEHOLDER},
{"braveWalletInputLabelPassword", IDS_BRAVE_WALLET_INPUT_LABEL_PASSWORD},
{"braveWalletLearnAboutMyWallet", IDS_BRAVE_WALLET_LEARN_ABOUT_MY_WALLET},
{"braveWalletDisclosuresTitle", IDS_BRAVE_WALLET_DISCLOSURES_TITLE},
{"braveWalletDisclosuresDescription",
IDS_BRAVE_WALLET_DISCLOSURES_DESCRIPTION},
{"braveWalletSelfCustodyDisclosureCheckboxText",
IDS_BRAVE_WALLET_SELF_CUSTODY_DISCLOSURE_CHECKBOX_TEXT},
{"braveWalletTermsOfServiceCheckboxText",
IDS_BRAVE_WALLET_TERMS_OF_SERVICE_CHECKBOX_TEXT},
{"braveWalletBuyCryptoButton", IDS_BRAVE_WALLET_BUY_CRYPTO_BUTTON},
{"braveWalletDepositCryptoButton", IDS_BRAVE_WALLET_DEPOSIT_CRYPTO_BUTTON},
{"braveWalletCheckingInstalledExtensions",
IDS_BRAVE_WALLET_CHECKING_INSTALLED_EXTENSIONS},
{"braveWalletImportFromLegacy", IDS_BRAVE_WALLET_IMPORT_FROM_LEGACY},
{"braveWalletBuySelectAsset", IDS_BRAVE_WALLET_BUY_SELECT_ASSET},
{"braveWalletFundWalletTitle", IDS_BRAVE_WALLET_FUND_WALLET_TITLE},
{"braveWalletDepositFundsTitle", IDS_BRAVE_WALLET_DEPOSIT_FUNDS_TITLE},
{"braveWalletDepositX", IDS_BRAVE_WALLET_DEPOSIT_X},
{"braveWalletDepositSolSplTokens", IDS_BRAVE_WALLET_DEPOSIT_SOL_SPL_TOKENS},
{"braveWalletDepositErc", IDS_BRAVE_WALLET_DEPOSIT_ERC},
{"braveWalletDepositOnlySendOnXNetwork",
IDS_BRAVE_WALLET_DEPOSIT_ONLY_SEND_ON_X_NETWORK},
{"braveWalletFundWalletDescription",
IDS_BRAVE_WALLET_FUND_WALLET_DESCRIPTION},
{"braveWalletLearnMoreAboutBraveWallet",
IDS_BRAVE_WALLET_LEARN_MORE_ABOUT_BRAVE_WALLET}};

// 0x swap constants
constexpr char kRopstenSwapBaseAPIURL[] = "https://ropsten.api.0x.org/";
Expand Down
5 changes: 5 additions & 0 deletions components/brave_wallet_ui/assets/svg-icons/checkbox-check.svg
View file
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 components/brave_wallet_ui/assets/svg-icons/crypto-wallets-icon.svg
View file
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 components/brave_wallet_ui/assets/svg-icons/download-icon.svg
View file
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 components/brave_wallet_ui/assets/svg-icons/grid-icon.svg
View file
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 components/brave_wallet_ui/assets/svg-icons/ipfs-icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8c970d8

Please sign in to comment.