From 26dca4146cfa74b20713f6e53c9f4f97488bb905 Mon Sep 17 00:00:00 2001 From: brave-builds Date: Fri, 2 Sep 2022 07:09:45 +0000 Subject: [PATCH] Uplift of #14881 (squashed) to beta --- .../browser/brave_wallet_constants.cc | 155 ++++++++++-------- .../assets/svg-icons/sardine-logo-dark.svg | 25 +-- .../assets/svg-icons/sardine-logo-light.svg | 26 +-- .../components/buy-send-swap/buy/index.tsx | 2 +- .../components/buy-send-swap/buy/style.ts | 26 --- components/brave_wallet_ui/constants/types.ts | 9 +- 6 files changed, 100 insertions(+), 143 deletions(-) diff --git a/components/brave_wallet/browser/brave_wallet_constants.cc b/components/brave_wallet/browser/brave_wallet_constants.cc index edb4c67ebc6c..d948d3e7fabc 100644 --- a/components/brave_wallet/browser/brave_wallet_constants.cc +++ b/components/brave_wallet/browser/brave_wallet_constants.cc @@ -163,78 +163,89 @@ const std::vector& GetRampBuyTokens() { } const std::vector& GetSardineBuyTokens() { - static base::NoDestructor> tokens({ - {"", "Ethereum", "", false, false, "ETH", 18, true, "", "", - mojom::kMainnetChainId, mojom::CoinType::ETH}, - {"0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9", "AAVE", "aave.png", true, - false, "AAVE", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9", "AAVE", "aave.png", true, - false, "AAVE", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"", "Avalanche", "", false, false, "AVAX", 18, true, "", "", - mojom::kAvalancheMainnetChainId, mojom::CoinType::ETH}, - {"0x0d8775f648430679a709e98d2b0cb6250d2887ef", "Basic Attention Token", - "bat.png", true, false, "BAT", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"0x4Fabb145d64652a948d72533023f6E7A623C7C53", "Binance USD", "BUSD.png", - true, false, "BUSD", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"0x4Fabb145d64652a948d72533023f6E7A623C7C53", "Binance USD", "busd.png", - true, false, "BUSD", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"0xc00e94Cb662C3520282E6f5717214004A7f26888", "Compound", "comp.png", - true, false, "Comp", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"0x6B175474E89094C44Da98b954EedeAC495271d0F", "DAI", "dai.png", true, - false, "DAI", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"0x0f5d2fb29fb7d3cfee444a200298f468908cc942", "Decentraland", "mana.png", - true, false, "MANA", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"0xf629cbd94d3791c9250152bd8dfbdf380e2a3b9c", "Enjin Coin", "enj.png", - true, false, "ENJ", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"", "Fantom", "", false, false, "FTM", 18, true, "", "", - mojom::kFantomMainnetChainId, mojom::CoinType::ETH}, - {"0xdeFA4e8a7bcBA345F687a2f1456F5Edd9CE97202", "Kyber Network", - "kyber.png", true, false, "KNC", 18, true, "", "", - mojom::kMainnetChainId, mojom::CoinType::ETH}, - {"0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2", "Maker", "mkr.png", true, - false, "MKR", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"0xd26114cd6ee289accf82350c8d8487fedb8a0c07", "OMG Network", "omg.png", - true, false, "OMG", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"", "Polygon", "", false, false, "MATIC", 18, true, "", "", - mojom::kPolygonMainnetChainId, mojom::CoinType::ETH}, - {"0x45804880de22913dafe09f4980848ece6ecbaf78", "Pax Gold", "paxg.png", - true, false, "PAXG", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"0x8e870d67f660d95d5be530380d0ec0bd388289e1", "Pax Dollar", "usdp.png", - true, false, "PAX", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"0x95ad61b0a150d79219dcf64e1e6cc01f0b64c4ce", "Shiba Inu", "shib.png", - true, false, "SHIB", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"", "Solana", "", false, false, "SOL", 9, true, "", "", - mojom::kSolanaMainnet, mojom::CoinType::SOL}, - {"0xdAC17F958D2ee523a2206206994597C13D831ec7", "Tether", "usdt.png", true, - false, "USDT", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"0xc944e90c64b2c07662a292be6244bdf05cda44a7", "The Graph", - "graphToken.png", true, false, "GRT", 18, true, "", "", - mojom::kMainnetChainId, mojom::CoinType::ETH}, - {"0x3845badAde8e6dFF049820680d1F14bD3903a5d0", "The Sandbox", "sand.png", - true, false, "SAND", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984", "Uniswap", "uni.png", true, - false, "UNI", 18, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - {"0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", "USD Coin", "usdc.png", - true, false, "USDC", 6, true, "", "", mojom::kMainnetChainId, - mojom::CoinType::ETH}, - }); + static base::NoDestructor> tokens( + {{"", "Ethereum", "", false, false, "ETH", 18, true, "", "", + mojom::kMainnetChainId, mojom::CoinType::ETH}, + {"0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9", "AAVE", "aave.png", true, + false, "AAVE", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9", "AAVE", "aave.png", true, + false, "AAVE", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"", "Avalanche", "", false, false, "AVAX", 18, true, "", "", + mojom::kAvalancheMainnetChainId, mojom::CoinType::ETH}, + {"0x0d8775f648430679a709e98d2b0cb6250d2887ef", "Basic Attention Token", + "bat.png", true, false, "BAT", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0x4Fabb145d64652a948d72533023f6E7A623C7C53", "Binance USD", "BUSD.png", + true, false, "BUSD", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0x4Fabb145d64652a948d72533023f6E7A623C7C53", "Binance USD", "busd.png", + true, false, "BUSD", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0xc00e94Cb662C3520282E6f5717214004A7f26888", "Compound", "comp.png", + true, false, "Comp", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0x6B175474E89094C44Da98b954EedeAC495271d0F", "DAI", "dai.png", true, + false, "DAI", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0x0f5d2fb29fb7d3cfee444a200298f468908cc942", "Decentraland", + "mana.png", true, false, "MANA", 18, true, "", "", + mojom::kMainnetChainId, mojom::CoinType::ETH}, + {"0xf629cbd94d3791c9250152bd8dfbdf380e2a3b9c", "Enjin Coin", "enj.png", + true, false, "ENJ", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"", "Fantom", "", false, false, "FTM", 18, true, "", "", + mojom::kFantomMainnetChainId, mojom::CoinType::ETH}, + {"0xdeFA4e8a7bcBA345F687a2f1456F5Edd9CE97202", "Kyber Network", + "kyber.png", true, false, "KNC", 18, true, "", "", + mojom::kMainnetChainId, mojom::CoinType::ETH}, + {"0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2", "Maker", "mkr.png", true, + false, "MKR", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0xd26114cd6ee289accf82350c8d8487fedb8a0c07", "OMG Network", "omg.png", + true, false, "OMG", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"", "Polygon", "", false, false, "MATIC", 18, true, "", "", + mojom::kPolygonMainnetChainId, mojom::CoinType::ETH}, + {"0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0", "Polygon", "matic.png", + false, false, "MATIC", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0x45804880de22913dafe09f4980848ece6ecbaf78", "Pax Gold", "paxg.png", + true, false, "PAXG", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0x8e870d67f660d95d5be530380d0ec0bd388289e1", "Pax Dollar", "usdp.png", + true, false, "PAX", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0x95ad61b0a150d79219dcf64e1e6cc01f0b64c4ce", "Shiba Inu", "shib.png", + true, false, "SHIB", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"", "Solana", "", false, false, "SOL", 9, true, "", "", + mojom::kSolanaMainnet, mojom::CoinType::SOL}, + {"0xdAC17F958D2ee523a2206206994597C13D831ec7", "Tether", "usdt.png", + true, false, "USDT", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0xc944e90c64b2c07662a292be6244bdf05cda44a7", "The Graph", + "graphToken.png", true, false, "GRT", 18, true, "", "", + mojom::kMainnetChainId, mojom::CoinType::ETH}, + {"0x3845badAde8e6dFF049820680d1F14bD3903a5d0", "TrueUSD", "tusd.png", + true, false, "TUSD", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0x0000000000085d4780B73119b644AE5ecd22b376", "The Sandbox", "sand.png", + true, false, "SAND", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984", "Uniswap", "uni.png", + true, false, "UNI", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", "USD Coin", "usdc.png", + true, false, "USDC", 6, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0xe41d2489571d322189246dafa5ebde1f4699f498", "Ox", "zrx.png", true, + false, "ZRX", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}, + {"0xbb0e17ef65f82ab018d8edd776e8dd940327b28b", "Axie Infinity", + "axs.png", true, false, "AXS", 18, true, "", "", mojom::kMainnetChainId, + mojom::CoinType::ETH}}); return *tokens; } diff --git a/components/brave_wallet_ui/assets/svg-icons/sardine-logo-dark.svg b/components/brave_wallet_ui/assets/svg-icons/sardine-logo-dark.svg index 416d446a633e..4f7e6a85678f 100644 --- a/components/brave_wallet_ui/assets/svg-icons/sardine-logo-dark.svg +++ b/components/brave_wallet_ui/assets/svg-icons/sardine-logo-dark.svg @@ -1,24 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/components/brave_wallet_ui/assets/svg-icons/sardine-logo-light.svg b/components/brave_wallet_ui/assets/svg-icons/sardine-logo-light.svg index 9906a6237df6..5101a978ab6c 100644 --- a/components/brave_wallet_ui/assets/svg-icons/sardine-logo-light.svg +++ b/components/brave_wallet_ui/assets/svg-icons/sardine-logo-light.svg @@ -1,24 +1,12 @@ - - - - - - - - - - - - - - - - - + + + + + - - + + diff --git a/components/brave_wallet_ui/components/buy-send-swap/buy/index.tsx b/components/brave_wallet_ui/components/buy-send-swap/buy/index.tsx index f2245872d63f..fa05ddd33009 100644 --- a/components/brave_wallet_ui/components/buy-send-swap/buy/index.tsx +++ b/components/brave_wallet_ui/components/buy-send-swap/buy/index.tsx @@ -89,7 +89,7 @@ export const Buy = ({ return [...rampAssetOptions, ...wyreAssetOptions, ...sardineAssetOptions] .map(asset => asset.chainId.toLowerCase()) .includes(selectedNetwork.chainId.toLowerCase()) - }, [selectedNetwork, rampAssetOptions, wyreAssetOptions]) + }, [selectedNetwork, rampAssetOptions, wyreAssetOptions, sardineAssetOptions]) // methods const onSubmitBuy = React.useCallback(async (buyOption: BraveWallet.OnRampProvider) => { diff --git a/components/brave_wallet_ui/components/buy-send-swap/buy/style.ts b/components/brave_wallet_ui/components/buy-send-swap/buy/style.ts index 3b776b01fc3c..2e7516378f45 100644 --- a/components/brave_wallet_ui/components/buy-send-swap/buy/style.ts +++ b/components/brave_wallet_ui/components/buy-send-swap/buy/style.ts @@ -1,6 +1,4 @@ import styled from 'styled-components' -import RampIcon from '../../../assets/svg-icons/ramp-icon.svg' -import WyreIcon from '../../../assets/svg-icons/wyre-icon.svg' export const StyledWrapper = styled.div` display: flex; @@ -10,30 +8,6 @@ export const StyledWrapper = styled.div` justify-content: center; ` -const LogoBase = styled.div` - width: 19px; - height: 22px; - margin-right: 5px; - background-size: cover; - background-repeat: no-repeat; -` - -export const WyreLogo = styled(LogoBase)` - width: 19px; - height:17px; - margin-right: 5px; - background-image: url(${WyreIcon}); - background-size: contain; - background-position: center; -` - -export const RampLogo = styled(LogoBase)` - width: 19px; - height: 12px; - margin-right: 5px; - background-image: url(${RampIcon}); -` - export const Spacer = styled.div` margin-bottom: 30px; ` diff --git a/components/brave_wallet_ui/constants/types.ts b/components/brave_wallet_ui/constants/types.ts index 9514f566dcc8..bae1f778b213 100644 --- a/components/brave_wallet_ui/constants/types.ts +++ b/components/brave_wallet_ui/constants/types.ts @@ -573,7 +573,8 @@ export const BuySupportedChains = [ BraveWallet.CELO_MAINNET_CHAIN_ID, BraveWallet.SOLANA_MAINNET, BraveWallet.OPTIMISM_MAINNET_CHAIN_ID, - BraveWallet.FILECOIN_MAINNET + BraveWallet.FILECOIN_MAINNET, + BraveWallet.FANTOM_MAINNET_CHAIN_ID ] export interface GetAllNetworksList { @@ -720,7 +721,11 @@ export const SupportedOnRampNetworks = [ BraveWallet.POLYGON_MAINNET_CHAIN_ID, BraveWallet.BINANCE_SMART_CHAIN_MAINNET_CHAIN_ID, BraveWallet.CELO_MAINNET_CHAIN_ID, - BraveWallet.AVALANCHE_MAINNET_CHAIN_ID + BraveWallet.AVALANCHE_MAINNET_CHAIN_ID, + BraveWallet.FANTOM_MAINNET_CHAIN_ID, + BraveWallet.CELO_MAINNET_CHAIN_ID, + BraveWallet.OPTIMISM_MAINNET_CHAIN_ID + ] export const SupportedTestNetworks = [