diff options
27 files changed, 237 insertions, 339 deletions
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index ee29b0b6a..de5c6ca1c 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -15,7 +15,7 @@ "message": "Expose accounts to the current website. Useful for legacy dapps." }, "chartOnlyAvailableEth": { - "message": "Chart only available on Ethereum networks." + "message": "Chart only available on Tangerine networks." }, "confirmExpose": { "message": "Are you sure you want to expose your accounts to the current website?" @@ -111,7 +111,7 @@ "message": "Add Suggested Tokens" }, "addAcquiredTokens": { - "message": "Add the tokens you've acquired using MetaMask" + "message": "Add the tokens you've acquired using Tangerine Wallet" }, "agreeTermsOfService": { "message": "I agree to the Terms of Service" @@ -164,7 +164,7 @@ "message": "Auto-Logout Timer (minutes)" }, "autoLogoutTimeLimitDescription": { - "message": "Set the idle time in minutes before MetaMask will automatically log out" + "message": "Set the idle time in minutes before Tangerine Wallet will automatically log out" }, "available": { "message": "Available" @@ -280,7 +280,7 @@ "message": "Close" }, "chromeRequiredForHardwareWallets": { - "message": "You need to use MetaMask on Google Chrome in order to connect to your Hardware Wallet." + "message": "You need to use Tangerine Wallet on Google Chrome in order to connect to your Hardware Wallet." }, "company": { "message": "Company" @@ -455,7 +455,7 @@ "message": "Decimals of Precision" }, "defaultNetwork": { - "message": "The default network for Ether transactions is Main Net." + "message": "The default network for TAN transactions is Main Net." }, "delete": { "message": "Delete" @@ -474,10 +474,10 @@ "description": "Tells the user what coin they have selected to deposit with shapeshift" }, "depositEth": { - "message": "Deposit Eth" + "message": "Deposit TAN" }, "depositEther": { - "message": "Deposit Ether" + "message": "Deposit TAN" }, "depositFiat": { "message": "Deposit with Fiat" @@ -489,7 +489,7 @@ "message": "Deposit with ShapeShift" }, "depositShapeShiftExplainer": { - "message": "If you own other cryptocurrencies, you can trade and deposit Ether directly into your MetaMask wallet. No Account Needed." + "message": "If you own other cryptocurrencies, you can trade and deposit TAN directly into your MetaMask wallet. No Account Needed." }, "details": { "message": "Details" @@ -498,10 +498,10 @@ "message": "Direct Deposit" }, "directDepositEther": { - "message": "Directly Deposit Ether" + "message": "Directly Deposit TAN" }, "directDepositEtherExplainer": { - "message": "If you already have some Ether, the quickest way to get Ether in your new wallet by direct deposit." + "message": "If you already have some TAN, the quickest way to get TAN in your new wallet by direct deposit." }, "done": { "message": "Done" @@ -552,7 +552,7 @@ "message": "Never share the phrase with anyone." }, "endOfFlowMessage5": { - "message": "Be careful of phishing! MetaMask will never spontaneously ask for your seed phrase." + "message": "Be careful of phishing! Tangerine Wallet will never spontaneously ask for your seed phrase." }, "endOfFlowMessage6": { "message": "If you need to back up your seed phrase again, you can find it in Settings -> Security." @@ -561,7 +561,7 @@ "message": "If you ever have questions or see something fishy, email support@metamask.io." }, "endOfFlowMessage8": { - "message": "MetaMask cannot recover your seedphrase. Learn more." + "message": "Tangerine Wallet cannot recover your seedphrase. Learn more." }, "ensNameNotFound": { "message": "ENS name not found" @@ -576,10 +576,10 @@ "message": "Enter password to continue" }, "eth": { - "message": "ETH" + "message": "TAN" }, "etherscanView": { - "message": "View account on Etherscan" + "message": "View account on Tangerine Garden" }, "estimatedProcessingTimes": { "message": "Estimated Processing Times" @@ -672,7 +672,7 @@ "message": "Gas Price Extremely Low" }, "gasPriceInfoModalContent": { - "message": "Gas price specifies the amount of Ether you are willing to pay for each unit of gas." + "message": "Gas price specifies the amount of TAN you are willing to pay for each unit of gas." }, "gasPriceNoDenom": { "message": "Gas Price" @@ -693,10 +693,10 @@ "message": "Generating transaction" }, "getEther": { - "message": "Get Ether" + "message": "Get TAN" }, "getEtherFromFaucet": { - "message": "Get Ether from a faucet for the $1", + "message": "Get TAN from a faucet for the $1", "description": "Displays network name for Ether faucet" }, "getHelp": { @@ -722,7 +722,7 @@ "message": "Connect a hardware wallet" }, "hardwareWalletsMsg": { - "message": "Select a hardware wallet you'd like to use with MetaMask" + "message": "Select a hardware wallet you'd like to use with Tangerine Wallet" }, "havingTroubleConnecting": { "message": "Having trouble connecting?" @@ -750,10 +750,10 @@ "message": "History" }, "howToDeposit": { - "message": "How would you like to deposit Ether?" + "message": "How would you like to deposit TAN?" }, "holdEther": { - "message": "It allows you to hold ether & tokens, and serves as your bridge to decentralized applications." + "message": "It allows you to hold TAN & tokens, and serves as your bridge to decentralized applications." }, "import": { "message": "Import", @@ -763,7 +763,7 @@ "message": "Import Account" }, "importAccountMsg": { - "message": " Imported accounts will not be associated with your originally created MetaMask account seedphrase. Learn more about imported accounts " + "message": " Imported accounts will not be associated with your originally created Tangerine Wallet account seedphrase. Learn more about imported accounts " }, "importAccountSeedPhrase": { "message": "Import an Account with Seed Phrase" @@ -818,7 +818,7 @@ "message": "Known contract address." }, "invalidAddressRecipientNotEthNetwork": { - "message": "Not ETH network, set to lowercase" + "message": "Not Tangerine network, set to lowercase" }, "invalidGasParams": { "message": "Invalid Gas Parameters" @@ -843,7 +843,7 @@ "description": "format for importing an account" }, "keepTrackTokens": { - "message": "Keep track of the tokens you’ve bought with your MetaMask account." + "message": "Keep track of the tokens you’ve bought with your Tangerine Wallet account." }, "kovan": { "message": "Kovan Test Network" @@ -916,13 +916,13 @@ "message": "Message" }, "metamaskDescription": { - "message": "Connecting you to Ethereum and the Decentralized Web." + "message": "Connecting you to Tangerine and the Decentralized Web." }, "metamaskSeedWords": { - "message": "MetaMask Seed Words" + "message": "Tangerine Wallet Seed Words" }, "metamaskVersion": { - "message": "MetaMask Version" + "message": "Tangerine Wallet Version" }, "min": { "message": "Minimum" @@ -946,7 +946,7 @@ "message": "Must select at least 1 token." }, "needEtherInWallet": { - "message": "To interact with decentralized applications using MetaMask, you’ll need Ether in your wallet." + "message": "To interact with decentralized applications using Tangerine Wallet, you’ll need TAN in your wallet." }, "needImportFile": { "message": "You must select a file to import.", @@ -957,7 +957,7 @@ "description": "Password and file needed to import an account" }, "negativeETH": { - "message": "Can not send negative amounts of ETH." + "message": "Can not send negative amounts of TAN." }, "networkName": { "message": "Network Name" @@ -994,7 +994,7 @@ "message": "New Network" }, "newToMetaMask": { - "message": "New to MetaMask?" + "message": "New to Tangerine Wallet?" }, "noAlreadyHaveSeed": { "message": "No, I already have a seed phrase" @@ -1003,7 +1003,7 @@ "message": "Protect Your Keys!" }, "protectYourKeysMessage1": { - "message": "Be careful with your seed phrase — there have been reports of websites that attempt to imitate MetaMask. MetaMask will never ask for your seed phrase!" + "message": "Be careful with your seed phrase — there have been reports of websites that attempt to imitate Tangerine Wallet. Tangerine Wallet will never ask for your seed phrase!" }, "protectYourKeysMessage2": { "message": "Keep your phrase safe. If you see something fishy, or you’re uncertain about a website, email support@metamask.io" @@ -1075,10 +1075,10 @@ "message": "You have returned to the old UI. You can switch back to the New UI through the option in the top right dropdown menu." }, "onlySendToEtherAddress": { - "message": "Only send ETH to an Ethereum address." + "message": "Only send TAN to an Tangerine Network address." }, "onlySendTokensToAccountAddress": { - "message": "Only send $1 to an Ethereum account address.", + "message": "Only send $1 to an Tangerine account address.", "description": "displays token symbol" }, "openInTab": { @@ -1155,7 +1155,7 @@ "message": "Primary Currency" }, "primaryCurrencySettingDescription": { - "message": "Select native to prioritize displaying values in the native currency of the chain (e.g. ETH). Select Fiat to prioritize displaying values in your selected fiat currency." + "message": "Select native to prioritize displaying values in the native currency of the chain (e.g. TAN). Select Fiat to prioritize displaying values in your selected fiat currency." }, "privacyMsg": { "message": "Privacy Policy" @@ -1320,7 +1320,7 @@ "message": "Your secret backup phrase makes it easy to back up and restore your account." }, "secretBackupPhraseWarning": { - "message": "WARNING: Never disclose your backup phrase. Anyone with this phrase can take your Ether forever." + "message": "WARNING: Never disclose your backup phrase. Anyone with this phrase can take your TAN forever." }, "secretPhrase": { "message": "Enter your secret twelve word phrase here to restore your vault." @@ -1365,13 +1365,13 @@ "message": "Send Amount" }, "sendETH": { - "message": "Send ETH" + "message": "Send TAN" }, "sendTokens": { "message": "Send Tokens" }, "sentEther": { - "message": "sent ether" + "message": "sent TAN" }, "sentTokens": { "message": "sent tokens" @@ -1389,7 +1389,7 @@ "message": "Select an Account" }, "selectAnAccountHelp": { - "message": "Select the account to view in MetaMask" + "message": "Select the account to view in Tangerine Wallet" }, "selectAnAsset": { "message": "Select an Asset" @@ -1404,7 +1404,7 @@ "message": "If you don't see your existing Ledger accounts below, try switching paths to \"Legacy (MEW / MyCrypto)\"" }, "sendTokensAnywhere": { - "message": "Send Tokens to anyone with an Ethereum account" + "message": "Send Tokens to anyone with an Tangerine Network account" }, "settings": { "message": "Settings" @@ -1509,7 +1509,7 @@ "message": "3. Start using dApps and more!" }, "step3HardwareWalletMsg": { - "message": "Use your hardware account like you would with any Ethereum account. Log in to dApps, send Eth, buy and store ERC20 tokens and Non-Fungible tokens like CryptoKitties." + "message": "Use your hardware account like you would with any Tangerine Network account. Log in to dApps, send TAN, buy and store ERC20 tokens and Non-Fungible tokens like CryptoKitties." }, "storePhrase": { "message": "Store this phrase in a password manager like 1Password." @@ -1594,7 +1594,7 @@ "message": "Token Symbol" }, "tokenWarning1": { - "message": "Keep track of the tokens you’ve bought with your MetaMask account. If you bought tokens using a different account, those tokens will not appear here." + "message": "Keep track of the tokens you’ve bought with your Tangerine Wallet account. If you bought tokens using a different account, those tokens will not appear here." }, "total": { "message": "Total" @@ -1676,19 +1676,19 @@ "message": "Try again" }, "twelveWords": { - "message": "These 12 words are the only way to restore your MetaMask accounts.\nSave them somewhere safe and secret." + "message": "These 12 words are the only way to restore your Tangerine Wallet accounts.\nSave them somewhere safe and secret." }, "typePassword": { - "message": "Type your MetaMask password" + "message": "Type your Tangerine Wallet password" }, "uiMigrationAnnouncement": { - "message": "Welcome to the new MetaMask UI. If you have feedback about the UI or feature requests, please reach out to our support team or on GitHub." + "message": "Welcome to the new Tangerine Wallet UI. If you have feedback about the UI or feature requests, please reach out to our support team or on GitHub." }, "uiWelcome": { "message": "Welcome to the New UI (Beta)" }, "uiWelcomeMessage": { - "message": "You are now using the new MetaMask UI." + "message": "You are now using the new Tangerine Wallet UI." }, "unapproved": { "message": "Unapproved" @@ -1755,7 +1755,7 @@ "message": "View at $1" }, "viewOnEtherscan": { - "message": "View on Etherscan" + "message": "View on Tangerine Garden" }, "viewNetworkInfo": { "message": "View Network Info" @@ -1773,7 +1773,7 @@ "message": "Welcome Back!" }, "welcome": { - "message": "Welcome to MetaMask" + "message": "Welcome to Tangerine Wallet" }, "whatsThis": { "message": "What's this?" @@ -1806,7 +1806,7 @@ "message": "You’ll see this image everytime you need to confirm a transaction." }, "yourUniqueAccountImageDescription3": { - "message": "MetaMask will never ask for your seed phrase!" + "message": "Tangerine Wallet will never ask for your seed phrase!" }, "zeroGasPriceOnSpeedUpError": { "message":"Zero gas price on speed up" diff --git a/app/_locales/index.json b/app/_locales/index.json index 30fb87faf..48973cf21 100644 --- a/app/_locales/index.json +++ b/app/_locales/index.json @@ -1,25 +1,5 @@ [ - { "code": "cs", "name": "Čeština" }, - { "code": "de", "name": "Deutsche" }, { "code": "en", "name": "English" }, - { "code": "es", "name": "Español" }, - { "code": "fr", "name": "Français" }, - { "code": "ht", "name": "Kreyòl ayisyen" }, - { "code": "hn", "name": "हिन्दी" }, - { "code": "it", "name": "Italiano" }, - { "code": "ja", "name": "日本語" }, - { "code": "ko", "name": "한국어" }, - { "code": "nl", "name": "Nederlands" }, - { "code": "ph", "name": "Pilipino" }, - { "code": "pl", "name": "Polskie" }, - { "code": "pt", "name": "Português" }, - { "code": "ru", "name": "Русский" }, - { "code": "sk", "name": "Slovenčina" }, - { "code": "sl", "name": "Slovenščina" }, - { "code": "th", "name": "ไทย" }, - { "code": "tml", "name": "தமிழ்" }, - { "code": "tr", "name": "Türkçe" }, - { "code": "vi", "name": "Tiếng Việt" }, { "code": "zh_CN", "name": "中文(简体)" }, { "code": "zh_TW", "name": "中文(繁體)" } ] diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 8735e80e4..2266f6bba 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -42,10 +42,10 @@ "message": "Web3 API请求" }, "reviewProviderRequest": { - "message": "请查看此Ethereum API请求。" + "message": "请查看此 Tangerine Network API请求。" }, "providerRequestInfo": { - "message": "下面列出的域正在尝试请求访问Ethereum API，以便它可以与以太坊区块链进行交互。在批准Ethereum访问之前，请务必仔细检查您是否在正确的站点上。" + "message": "下面列出的域正在尝试请求访问 Tangerine Network API，以便它可以与Tangerine区块链进行交互。在批准 Tangerine Network 访问之前，请务必仔细检查您是否在正确的站点上。" }, "accept": { "message": "接受" @@ -72,7 +72,7 @@ "message": "添加代币" }, "addAcquiredTokens": { - "message": "在Metamask上添加已用的代币" + "message": "在 Tangerine Wallet 上添加已用的代币" }, "amount": { "message": "数量" @@ -81,11 +81,11 @@ "message": "数量 + Gas" }, "appDescription": { - "message": "以太坊浏览器插件", + "message": "Tangerine Network 浏览器插件", "description": "The description of the application" }, "appName": { - "message": "MetaMask", + "message": "Tangerine Wallet", "description": "The name of the application" }, "approved": { @@ -126,7 +126,7 @@ "message": "Borrow With Dharma (Beta)" }, "builtInCalifornia": { - "message": "MetaMask在加利福尼亚设计和制造。" + "message": "MetaMask 在加利福尼亚设计和制造。" }, "buy": { "message": "购买" @@ -253,7 +253,7 @@ "message": "精确小数点" }, "defaultNetwork": { - "message": "默认以太坊交易网络为主网。" + "message": "默认Tangerine交易网络为主网。" }, "denExplainer": { "message": "你的 DEN 是存储在 MetaMask 中的已加密密码。" @@ -269,10 +269,10 @@ "description": "Tells the user what coin they have selected to deposit with shapeshift" }, "depositEth": { - "message": "存入 Eth" + "message": "存入 TAN" }, "depositEther": { - "message": "存入 Ether" + "message": "存入 TAN" }, "depositFiat": { "message": "从 Fiat 存入" @@ -284,7 +284,7 @@ "message": "从 ShapeShift 存入" }, "depositShapeShiftExplainer": { - "message": "如果你拥有其他加密货币，你可以直接交易并存入 Ether 到你的 MetaMask 钱包。 不需要帐户。" + "message": "如果你拥有其他加密货币，你可以直接交易并存入 TAN 到你的 Tangerine Wallet 钱包。 不需要帐户。" }, "details": { "message": "详情" @@ -293,10 +293,10 @@ "message": "直接存入" }, "directDepositEther": { - "message": "直接存入 Ether" + "message": "直接存入 TAN" }, "directDepositEtherExplainer": { - "message": "如果你已经有了一些 Ether，通过直接转入是你的新钱包获取 Ether 的最快捷方式。" + "message": "如果你已经有了一些 TAN，通过直接转入是你的新钱包获取 TAN 的最快捷方式。" }, "done": { "message": "完成" @@ -335,7 +335,7 @@ "message": "密码不匹配" }, "etherscanView": { - "message": "在 Etherscan 上查看账户" + "message": "在 Tangerine Garden 上查看账户" }, "exchangeRate": { "message": "兑换比率" @@ -404,11 +404,11 @@ "message": "生成 交易" }, "getEther": { - "message": "获取 Ether" + "message": "获取 TAN" }, "getEtherFromFaucet": { - "message": "从水管获取$1网络的 Ether", - "description": "Displays network name for Ether faucet" + "message": "从水管获取$1网络的 TAN", + "description": "Displays network name for TAN faucet" }, "greaterThanMin": { "message": "必须要大于等于 $1。", @@ -431,10 +431,10 @@ "message": "隐藏代币？" }, "howToDeposit": { - "message": "你想怎样转入 Ether？" + "message": "你想怎样转入 TAN" }, "holdEther": { - "message": "它允许你保存ether和代币，并作为你使用Dapp的桥梁." + "message": "它允许你保存 TAN 和代币，并作为你使用Dapp的桥梁." }, "import": { "message": "导入", @@ -444,7 +444,7 @@ "message": "导入账户" }, "importAccountMsg": { - "message": " Imported accounts will not be associated with your originally created MetaMask account seedphrase. Learn more about imported accounts " + "message": " Imported accounts will not be associated with your originally created Tangerine Wallet account seedphrase. Learn more about imported accounts " }, "importAnAccount": { "message": "导入一个账户" @@ -491,7 +491,7 @@ "description": "format for importing an account" }, "keepTrackTokens": { - "message": "Keep track of the tokens you’ve bought with your MetaMask account." + "message": "Keep track of the tokens you’ve bought with your Tangerine Wallet account." }, "kovan": { "message": "Kovan 测试网络" @@ -546,10 +546,10 @@ "message": "消息" }, "metamaskDescription": { - "message": "MetaMask is a secure identity vault for Ethereum." + "message": "Tangerine Wallet is a secure identity vault for Tangerine Network." }, "metamaskSeedWords": { - "message": "MetaMask 助记词" + "message": "Tangerine Wallet 助记词" }, "min": { "message": "最小" @@ -561,7 +561,7 @@ "message": "至少选择一种代币." }, "needEtherInWallet": { - "message": "使用 MetaMask 与 DAPP 交互，需要你的钱包里有 Ether。" + "message": "使用 Tangerine Wallet 与 DAPP 交互，需要你的钱包里有 TAN" }, "needImportFile": { "message": "必须选择导入一个文件。", @@ -572,7 +572,7 @@ "description": "Password and file needed to import an account" }, "negativeETH": { - "message": "Can not send negative amounts of ETH." + "message": "Can not send negative amounts of TAN." }, "networks": { "message": "网络" @@ -737,7 +737,7 @@ "message": "当前 RPC" }, "connectingToMainnet": { - "message": "正在连接到以太坊主网" + "message": "正在连接到主网" }, "connectingToRopsten": { "message": "正在连接到Ropsten测试网络" @@ -805,19 +805,19 @@ "message": "发送" }, "sendETH": { - "message": "发送 ETH" + "message": "发送 TAN" }, "sendTokens": { "message": "发送 代币" }, "onlySendToEtherAddress": { - "message": "只发送 ETH 给一个以太坊地址" + "message": "只发送 TAN 给一个Tangerine地址" }, "searchTokens": { "message": "搜索代币" }, "sendTokensAnywhere": { - "message": "将代币发送给拥有以太坊地址的任何人" + "message": "将代币发送给拥有Tangerine地址的任何人" }, "settings": { "message": "设置" @@ -892,7 +892,7 @@ "message": "至" }, "toETHviaShapeShift": { - "message": "$1 ETH 通过 ShapeShift", + "message": "$1 TAN 通过 ShapeShift", "description": "system will fill in deposit type in start of message" }, "tokenAddress": { @@ -911,7 +911,7 @@ "message": "代币符号" }, "tokenWarning1": { - "message": "Keep track of the tokens you’ve bought with your MetaMask account. If you bought tokens using a different account, those tokens will not appear here." + "message": "Keep track of the tokens you’ve bought with your Tangerine Wallet account. If you bought tokens using a different account, those tokens will not appear here." }, "total": { "message": "总量" @@ -936,7 +936,7 @@ "description": "Followed by a link (here) to view token balances" }, "twelveWords": { - "message": "这12个单词是恢复MetaMask帐户的唯一方法。.\n将它们存放在安全和秘密的地方。." + "message": "这12个单词是恢复 Tangerine Wallet 帐户的唯一方法。.\n将它们存放在安全和秘密的地方。." }, "typePassword": { "message": "输入你的密码" @@ -945,7 +945,7 @@ "message": "欢迎使用新版界面 （Beta）" }, "uiWelcomeMessage": { - "message": "你现在正在使用新的 MetaMask 界面。 尝试发送代币等新功能，有任何问题请告知我们。" + "message": "你现在正在使用新的 Tangerine Wallet 界面。 尝试发送代币等新功能，有任何问题请告知我们。" }, "unapproved": { "message": "未批准" @@ -991,7 +991,7 @@ "message": "警告" }, "welcome": { - "message": "欢迎使用 MetaMask 测试版" + "message": "欢迎使用 Tangerine Wallet" }, "whatsThis": { "message": "这是什么？" diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index eb50cc6f3..e33ee0b30 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -51,7 +51,7 @@ "message": "Web3 API 請求" }, "reviewProviderRequest": { - "message": "請查看此Ethereum API請求。" + "message": "請查看此 Tangerine Network API請求。" }, "accept": { "message": "接受" @@ -99,7 +99,7 @@ "message": "加入建議的代幣" }, "addAcquiredTokens": { - "message": "將您已經擁有的代幣顯示於 MetaMask" + "message": "將您已經擁有的代幣顯示於 Tangerine Wallet" }, "advanced": { "message": "進階" @@ -231,7 +231,7 @@ "message": "關閉" }, "chromeRequiredForHardwareWallets": { - "message": "您需要在 Google Chrome 瀏覽器使用 MetaMask 連結您的硬體錢包" + "message": "您需要在 Google Chrome 瀏覽器使用 Tangerine Wallet 連結您的硬體錢包" }, "confirm": { "message": "確認" @@ -367,7 +367,7 @@ "message": "小數點精度" }, "defaultNetwork": { - "message": "預設乙太幣交易網路為主網路" + "message": "預設TAN交易網路為主網路" }, "delete": { "message": "刪除" @@ -386,10 +386,10 @@ "description": "Tells the user what coin they have selected to deposit with shapeshift" }, "depositEth": { - "message": "存入乙太幣" + "message": "存入 TAN" }, "depositEther": { - "message": "存入乙太幣" + "message": "存入 TAN" }, "depositFiat": { "message": "從法定貨幣存入" @@ -401,7 +401,7 @@ "message": "從 ShapeShift 存入" }, "depositShapeShiftExplainer": { - "message": "如果您擁有其他加密貨幣，可直接轉換為乙太幣存入 MetaMask 錢包。不需開新帳戶。" + "message": "如果您擁有其他加密貨幣，可直接轉換為TAN存入 Tangerine Wallet 錢包。不需開新帳戶。" }, "details": { "message": "詳情" @@ -410,10 +410,10 @@ "message": "直接存入" }, "directDepositEther": { - "message": "直接存入乙太幣" + "message": "直接存入 TAN" }, "directDepositEtherExplainer": { - "message": "如果您已經擁有乙太幣，直接存入功能是讓新錢包最快取得乙太幣的方式。" + "message": "如果您已經擁有 TAN，直接存入功能是讓新錢包最快取得TAN的方式。" }, "done": { "message": "完成" @@ -467,10 +467,10 @@ "message": "您所輸入的密碼不一致" }, "eth": { - "message": "ETH" + "message": "TAN" }, "etherscanView": { - "message": "在 Etherscan 上查看帳戶" + "message": "在 Tangerine Garden 上查看帳戶" }, "estimatedProcessingTimes": { "message": "預估處理時間" @@ -578,10 +578,10 @@ "message": "產生交易" }, "getEther": { - "message": "取得乙太幣" + "message": "取得 TAN" }, "getEtherFromFaucet": { - "message": "從水管取得 $1 乙太幣。", + "message": "從水管取得 $1 TAN。", "description": "Displays network name for Ether faucet" }, "getHelp": { @@ -601,7 +601,7 @@ "message": "連線硬體錢包" }, "hardwareWalletsMsg": { - "message": "選擇要連線到 MetaMask 的硬體錢包" + "message": "選擇要連線到 Tangerine Wallet 的硬體錢包" }, "havingTroubleConnecting": { "message": "無法正確連線?" @@ -629,10 +629,10 @@ "message": "紀錄" }, "howToDeposit": { - "message": "您想怎麼存入乙太幣？" + "message": "您想怎麼存入TAN？" }, "holdEther": { - "message": "能讓您保存乙太幣和代幣，並成為您與去中心化應用程式的橋梁" + "message": "能讓您保存TAN和代幣，並成為您與去中心化應用程式的橋梁" }, "import": { "message": "匯入", @@ -642,7 +642,7 @@ "message": "匯入帳戶" }, "importAccountMsg": { - "message": " 匯入的帳戶與您原有 MetaMask 帳戶的助憶詞並無關聯。請查看與匯入帳戶相關的資料 " + "message": " 匯入的帳戶與您原有 Tangerine Wallet 帳戶的助憶詞並無關聯。請查看與匯入帳戶相關的資料 " }, "importAccountSeedPhrase": { "message": "利用助憶詞還原" @@ -711,7 +711,7 @@ "description": "format for importing an account" }, "keepTrackTokens": { - "message": "持續追蹤您 MetaMask 帳戶中的代幣。" + "message": "持續追蹤您 Tangerine Wallet 帳戶中的代幣。" }, "kovan": { "message": "Kovan 測試網路" @@ -760,7 +760,7 @@ "message": "登出" }, "loose": { - "message": "非 MetaMask 帳號" + "message": "非 Tangerine Wallet 帳號" }, "loweCaseWords": { "message": "助憶詞僅包含小寫字元" @@ -778,13 +778,13 @@ "message": "訊息" }, "metamaskDescription": { - "message": "MetaMask 是乙太坊安全身份識別金庫" + "message": "Tangerine Wallet是Tangerine Network安全身份識別金庫" }, "metamaskSeedWords": { - "message": "MetaMask Seed Words" + "message": "Tangerine Wallet Seed Words" }, "metamaskVersion": { - "message": "MetaMask 版本" + "message": "Tangerine Wallet 版本" }, "min": { "message": "最小" @@ -802,7 +802,7 @@ "message": "必須選擇至少 1 代幣" }, "needEtherInWallet": { - "message": "要使用 MetaMask 存取去中心化應用服務時，您的錢包中需要有乙太幣。" + "message": "要使用 Tangerine Wallet 存取去中心化應用服務時，您的錢包中需要有TAN。" }, "needImportFile": { "message": "您必須選擇一個檔案來匯入", @@ -813,7 +813,7 @@ "description": "Password and file needed to import an account" }, "negativeETH": { - "message": "不能送出負值的乙太幣" + "message": "不能送出負值的TAN" }, "networks": { "message": "網路" @@ -907,10 +907,10 @@ "message": "您已經切換到舊版界面。可以通過右上方下拉選單中的選項切換回新的使用者界面。" }, "onlySendToEtherAddress": { - "message": "只能發送到乙太坊位址" + "message": "只能發送到TAN位址" }, "onlySendTokensToAccountAddress": { - "message": "只能發送 $1 到乙太坊位址", + "message": "只能發送 $1 到Tangerine Network位址", "description": "displays token symbol" }, "openInTab": { @@ -975,7 +975,7 @@ "message": "主要顯示" }, "primaryCurrencySettingDescription": { - "message": "選擇使用乙太幣(ETH)或是法定貨幣(例如：美金)為主要錢幣顯示單位" + "message": "選擇使用TAN或是法定貨幣(例如：美金)為主要錢幣顯示單位" }, "privacyMsg": { "message": "隱私政策" @@ -1159,7 +1159,7 @@ "message": "助憶詞將可協助您用更簡單的方式備份帳戶資訊。" }, "secretBackupPhraseWarning": { - "message": "警告: 絕對不要洩漏您的助憶詞。任何人只要得知助憶詞代表他可以竊取您所有的乙太幣和代幣。" + "message": "警告: 絕對不要洩漏您的助憶詞。任何人只要得知助憶詞代表他可以竊取您所有的TAN和代幣。" }, "secretPhrase": { "message": "輸入您的12個助憶詞以回復金庫" @@ -1198,13 +1198,13 @@ "message": "發送數量" }, "sendETH": { - "message": "發送乙太幣" + "message": "發送TAN" }, "sendTokens": { "message": "發送代幣" }, "sentEther": { - "message": "發送乙太幣" + "message": "發送TAN" }, "sentTokens": { "message": "發送代幣" @@ -1222,7 +1222,7 @@ "message": "選擇帳戶" }, "selectAnAccountHelp": { - "message": "Select the account to view in MetaMask" + "message": "Select the account to view in Tangerine Wallet" }, "selectAHigherGasFee": { "message": "選擇更高的交易費可加速您的交易處理時間 *" @@ -1234,7 +1234,7 @@ "message": "若看不到您已經擁有的 Ledger 帳戶，請嘗試切換路徑為 \"Legacy (MEW / MyCrypto)\"" }, "sendTokensAnywhere": { - "message": "發送代幣給擁有乙太坊帳戶的任何人" + "message": "發送代幣給擁有Tangerine Network帳戶的任何人" }, "settings": { "message": "設定" @@ -1336,7 +1336,7 @@ "message": "3. 開始使用！" }, "step3HardwareWalletMsg": { - "message": "使用您硬體錢包中的帳戶，與去中心化應用服務交易乙太幣、ERC20代幣、或迷戀貓等數位資產。" + "message": "使用您硬體錢包中的帳戶，與去中心化應用服務交易TAN、ERC20代幣、或迷戀貓等數位資產。" }, "storePhrase": { "message": "您可以用密碼管理系統例如 1Password 等軟體儲存助憶詞。" @@ -1391,7 +1391,7 @@ "message": "代幣代號" }, "tokenWarning1": { - "message": "使用 MetaMask 帳戶追蹤您已購得的代幣。如果使用不同的帳戶保存購得的代幣，那些代幣就不會出現在這裡。" + "message": "使用 Tangerine Wallet 帳戶追蹤您已購得的代幣。如果使用不同的帳戶保存購得的代幣，那些代幣就不會出現在這裡。" }, "total": { "message": "總量" @@ -1473,19 +1473,19 @@ "message": "再試一次" }, "twelveWords": { - "message": "這 12 個單詞是唯一回復您的 MetaMask 帳戶的方法。\n將它們儲存到那些安全且隱密的地方吧。" + "message": "這 12 個單詞是唯一回復您的 Tangerine Wallet 帳戶的方法。\n將它們儲存到那些安全且隱密的地方吧。" }, "typePassword": { "message": "請輸入密碼" }, "uiMigrationAnnouncement": { - "message": "歡迎使用 MetaMask 新版使用介面。若您有任何關於使用介面的改善建議，請到GitHub聯絡我們的服務小組。" + "message": "歡迎使用 Tangerine Wallet 新版使用介面。若您有任何關於使用介面的改善建議，請到GitHub聯絡我們的服務小組。" }, "uiWelcome": { "message": "歡迎使用新版界面 (Beta)" }, "uiWelcomeMessage": { - "message": "您現在正在使用 MetaMask 新版界面。試試發送代幣等新功能吧，有任何問題請告知我們。" + "message": "您現在正在使用 Tangerine Wallet 新版界面。試試發送代幣等新功能吧，有任何問題請告知我們。" }, "unapproved": { "message": "未批准" @@ -1546,7 +1546,7 @@ "message": "查看帳戶" }, "viewOnEtherscan": { - "message": "在 Etherscan 上瀏覽" + "message": "在 Tangerine Garden 上瀏覽" }, "visitWebSite": { "message": "造訪我們的網站" @@ -1558,7 +1558,7 @@ "message": "歡迎回來!" }, "welcome": { - "message": "歡迎來到 MetaMask" + "message": "歡迎來到 Tangerine Wallet" }, "whatsThis": { "message": "這是什麼？" diff --git a/app/images/eth.svg b/app/images/eth.svg index 6375b790f..cd81c8a6f 100644 --- a/app/images/eth.svg +++ b/app/images/eth.svg @@ -1,14 +1,9 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve"> -<style type="text/css"> - .st0{fill:#38393A;} -</style> -<title>deposit-eth</title> -<desc>Created with Sketch.</desc> -<g id="deposit-eth" transform="translate(0.000000, 14.000000)"> - <path id="Shape" class="st0" d="M19.9,16L7.5,8.7L19.9,26L32.3,8.7L19.9,16L19.9,16z M20.1-14L7.7,6.4l12.4,7.3l12.4-7.2L20.1-14z" - /> -</g> +<svg xmlns="http://www.w3.org/2000/svg" width="31" height="30" viewBox="0 0 31 30"> + <g fill="none" fill-rule="evenodd"> + <path fill="#F3953F" d="M12.902 29.542C5.604 28.48 0 22.197 0 14.606c0-2.456.586-4.774 1.626-6.823 7.298 1.062 12.902 7.344 12.902 14.936a15.03 15.03 0 0 1-1.626 6.823z"/> + <path fill="#F27038" d="M21.447.896c5.238 2.368 8.883 7.639 8.883 13.76 0 7.726-5.803 14.095-13.288 14.988-5.237-2.368-8.882-7.639-8.882-13.76 0-7.726 5.803-14.095 13.287-14.988z"/> + <path fill="#DF6730" d="M.696 19.221a15.168 15.168 0 0 1 4.951-.825c6.786 0 12.532 4.45 14.48 10.59a15.168 15.168 0 0 1-4.951.825c-6.786 0-12.532-4.45-14.48-10.59z"/> + <path fill="#C55C27" d="M29.463 9.575c.561 1.586.867 3.292.867 5.07 0 8.098-6.337 14.715-14.322 15.164a15.164 15.164 0 0 1-.867-5.07c0-8.097 6.337-14.714 14.322-15.164z"/> + <path fill="#F4B544" d="M6.247 6.242A5.763 5.763 0 0 1 11.695 0a5.763 5.763 0 0 1-5.448 6.242z"/> + </g> </svg> diff --git a/app/images/eth_logo.svg b/app/images/eth_logo.svg index 894bd70dd..cd81c8a6f 100644 --- a/app/images/eth_logo.svg +++ b/app/images/eth_logo.svg @@ -1,11 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg width="256px" height="417px" viewBox="0 0 256 417" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid"> - <g> - <polygon fill="#343434" points="127.9611 0 125.1661 9.5 125.1661 285.168 127.9611 287.958 255.9231 212.32"/> - <polygon fill="#8C8C8C" points="127.962 0 0 212.32 127.962 287.959 127.962 154.158"/> - <polygon fill="#3C3C3B" points="127.9611 312.1866 126.3861 314.1066 126.3861 412.3056 127.9611 416.9066 255.9991 236.5866"/> - <polygon fill="#8C8C8C" points="127.962 416.9052 127.962 312.1852 0 236.5852"/> - <polygon fill="#141414" points="127.9611 287.9577 255.9211 212.3207 127.9611 154.1587"/> - <polygon fill="#393939" points="0.0009 212.3208 127.9609 287.9578 127.9609 154.1588"/> - </g> -</svg>
\ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" width="31" height="30" viewBox="0 0 31 30"> + <g fill="none" fill-rule="evenodd"> + <path fill="#F3953F" d="M12.902 29.542C5.604 28.48 0 22.197 0 14.606c0-2.456.586-4.774 1.626-6.823 7.298 1.062 12.902 7.344 12.902 14.936a15.03 15.03 0 0 1-1.626 6.823z"/> + <path fill="#F27038" d="M21.447.896c5.238 2.368 8.883 7.639 8.883 13.76 0 7.726-5.803 14.095-13.288 14.988-5.237-2.368-8.882-7.639-8.882-13.76 0-7.726 5.803-14.095 13.287-14.988z"/> + <path fill="#DF6730" d="M.696 19.221a15.168 15.168 0 0 1 4.951-.825c6.786 0 12.532 4.45 14.48 10.59a15.168 15.168 0 0 1-4.951.825c-6.786 0-12.532-4.45-14.48-10.59z"/> + <path fill="#C55C27" d="M29.463 9.575c.561 1.586.867 3.292.867 5.07 0 8.098-6.337 14.715-14.322 15.164a15.164 15.164 0 0 1-.867-5.07c0-8.097 6.337-14.714 14.322-15.164z"/> + <path fill="#F4B544" d="M6.247 6.242A5.763 5.763 0 0 1 11.695 0a5.763 5.763 0 0 1-5.448 6.242z"/> + </g> +</svg> diff --git a/app/images/info-logo-original.png b/app/images/info-logo-original.png Binary files differdeleted file mode 100644 index f654ed5b1..000000000 --- a/app/images/info-logo-original.png +++ /dev/null diff --git a/app/images/logo/metamask-fox-original.svg b/app/images/logo/metamask-fox-original.svg deleted file mode 100644 index 60a827b02..000000000 --- a/app/images/logo/metamask-fox-original.svg +++ /dev/null @@ -1,31 +0,0 @@ -<svg width="35" height="33" viewBox="0 0 35 33" fill="none" xmlns="http://www.w3.org/2000/svg"> - <path d="M32.9582 1L19.8241 10.7183L22.2665 4.99099L32.9582 1Z" fill="#E17726" stroke="#E17726" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M2.66296 1L15.6801 10.809L13.3547 4.99098L2.66296 1Z" fill="#E27625" stroke="#E27625" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M28.2295 23.5335L24.7348 28.8721L32.2177 30.9324L34.3613 23.6501L28.2295 23.5335Z" fill="#E27625" stroke="#E27625" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M1.27281 23.6501L3.40336 30.9324L10.8733 28.8721L7.39164 23.5335L1.27281 23.6501Z" fill="#E27625" stroke="#E27625" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M10.4706 14.5149L8.392 17.6507L15.797 17.9876L15.5501 10.0186L10.4706 14.5149Z" fill="#E27625" stroke="#E27625" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M25.1505 14.5149L19.993 9.92786L19.8242 17.9876L27.2291 17.6507L25.1505 14.5149Z" fill="#E27625" stroke="#E27625" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M10.8733 28.8721L15.3552 26.7082L11.4969 23.702L10.8733 28.8721Z" fill="#E27625" stroke="#E27625" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M20.2659 26.7082L24.7348 28.8721L24.1243 23.702L20.2659 26.7082Z" fill="#E27625" stroke="#E27625" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M24.7348 28.8721L20.2658 26.7082L20.6296 29.6107L20.5906 30.8417L24.7348 28.8721Z" fill="#D5BFB2" stroke="#D5BFB2" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M10.8732 28.8721L15.0304 30.8417L15.0044 29.6107L15.3552 26.7082L10.8732 28.8721Z" fill="#D5BFB2" stroke="#D5BFB2" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M15.1084 21.7842L11.3929 20.6958L14.0172 19.4907L15.1084 21.7842Z" fill="#233447" stroke="#233447" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M20.5126 21.7842L21.6039 19.4907L24.2411 20.6958L20.5126 21.7842Z" fill="#233447" stroke="#233447" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M10.8733 28.8721L11.5228 23.5335L7.39163 23.6502L10.8733 28.8721Z" fill="#CC6228" stroke="#CC6228" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M24.0982 23.5335L24.7348 28.8721L28.2294 23.6502L24.0982 23.5335Z" fill="#CC6228" stroke="#CC6228" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M27.2291 17.6507L19.8241 17.9876L20.5126 21.7842L21.6039 19.4907L24.2411 20.6958L27.2291 17.6507Z" fill="#CC6228" stroke="#CC6228" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M11.3929 20.6958L14.0171 19.4907L15.1084 21.7842L15.7969 17.9876L8.39195 17.6507L11.3929 20.6958Z" fill="#CC6228" stroke="#CC6228" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M8.392 17.6507L11.4969 23.702L11.393 20.6958L8.392 17.6507Z" fill="#E27525" stroke="#E27525" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M24.2412 20.6958L24.1243 23.702L27.2292 17.6507L24.2412 20.6958Z" fill="#E27525" stroke="#E27525" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M15.797 17.9876L15.1084 21.7843L15.9788 26.2676L16.1737 20.3589L15.797 17.9876Z" fill="#E27525" stroke="#E27525" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M19.8242 17.9876L19.4604 20.346L19.6423 26.2676L20.5127 21.7843L19.8242 17.9876Z" fill="#E27525" stroke="#E27525" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M20.5127 21.7842L19.6423 26.2676L20.2659 26.7082L24.1243 23.702L24.2412 20.6958L20.5127 21.7842Z" fill="#F5841F" stroke="#F5841F" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M11.3929 20.6958L11.4969 23.702L15.3552 26.7082L15.9788 26.2676L15.1084 21.7842L11.3929 20.6958Z" fill="#F5841F" stroke="#F5841F" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M20.5906 30.8417L20.6296 29.6107L20.2918 29.3256H15.3292L15.0044 29.6107L15.0304 30.8417L10.8732 28.8721L12.3283 30.0642L15.2772 32.0986H20.3308L23.2928 30.0642L24.7348 28.8721L20.5906 30.8417Z" fill="#C0AC9D" stroke="#C0AC9D" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M20.2659 26.7082L19.6423 26.2676H15.9788L15.3552 26.7082L15.0044 29.6107L15.3292 29.3256H20.2918L20.6296 29.6107L20.2659 26.7082Z" fill="#161616" stroke="#161616" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M33.5168 11.3532L34.6211 5.98873L32.9582 1L20.2659 10.3944L25.1505 14.5149L32.0488 16.5234L33.5688 14.7482L32.9062 14.2687L33.9585 13.3099L33.1531 12.6879L34.2054 11.8845L33.5168 11.3532Z" fill="#763E1A" stroke="#763E1A" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M1 5.98873L2.11724 11.3532L1.40273 11.8845L2.468 12.6879L1.66255 13.3099L2.71483 14.2687L2.05228 14.7482L3.57225 16.5234L10.4706 14.5149L15.3552 10.3944L2.66287 1L1 5.98873Z" fill="#763E1A" stroke="#763E1A" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M32.0489 16.5234L25.1506 14.5149L27.2292 17.6507L24.1243 23.702L28.2295 23.6501H34.3613L32.0489 16.5234Z" fill="#F5841F" stroke="#F5841F" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M10.4705 14.5149L3.57222 16.5234L1.27278 23.6501H7.39161L11.4968 23.702L8.39193 17.6507L10.4705 14.5149Z" fill="#F5841F" stroke="#F5841F" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> - <path d="M19.8241 17.9876L20.2658 10.3944L22.2665 4.991H13.3546L15.3552 10.3944L15.7969 17.9876L15.9658 20.3718L15.9788 26.2676H19.6423L19.6553 20.3718L19.8241 17.9876Z" fill="#F5841F" stroke="#F5841F" stroke-width="0.25" stroke-linecap="round" stroke-linejoin="round"/> -</svg> diff --git a/app/images/logo/metamask-logo-horizontal-original.svg b/app/images/logo/metamask-logo-horizontal-original.svg deleted file mode 100644 index 8e0bdb938..000000000 --- a/app/images/logo/metamask-logo-horizontal-original.svg +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="1311px" height="242px" viewBox="0 0 1311 242" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <!-- Generator: Sketch 51.3 (57544) - http://www.bohemiancoding.com/sketch --> - <title>metamask-logo-horizontal-beta</title> - <desc>Created with Sketch.</desc> - <defs></defs> - <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <g id="metamask-logo-horizontal-beta" transform="translate(1.000000, 1.000000)" fill-rule="nonzero"> - <g id="Group" transform="translate(360.000000, 60.000000)" fill="#161616"> - <path d="M796.7,60.9 C789.9,56.4 782.4,53.2 775.3,49.2 C770.7,46.6 765.8,44.3 761.8,41 C755,35.4 756.4,24.4 763.5,19.6 C773.7,12.8 790.6,16.6 792.4,30.5 C792.4,30.8 792.7,31 793,31 L808.4,31 C808.8,31 809.1,30.7 809,30.3 C808.2,20.7 804.5,12.7 797.7,7.6 C791.2,2.7 783.8,0.1 775.9,0.1 C735.2,0.1 731.5,43.2 753.4,56.8 C755.9,58.4 777.4,69.2 785,73.9 C792.6,78.6 795,87.2 791.7,94 C788.7,100.2 780.9,104.5 773.1,104 C764.6,103.5 758,98.9 755.7,91.7 C755.3,90.4 755.1,87.9 755.1,86.8 C755.1,86.5 754.8,86.2 754.5,86.2 L737.8,86.2 C737.5,86.2 737.2,86.5 737.2,86.8 C737.2,98.9 740.2,105.6 748.4,111.7 C756.1,117.5 764.5,119.9 773.2,119.9 C796,119.9 807.8,107 810.2,93.6 C812.3,80.5 808.4,68.7 796.7,60.9 Z" id="Shape"></path> - <path d="M71.6,2.3 L64.2,2.3 L56.1,2.3 C55.8,2.3 55.6,2.5 55.5,2.7 L41.8,47.9 C41.6,48.5 40.8,48.5 40.6,47.9 L26.9,2.7 C26.8,2.4 26.6,2.3 26.3,2.3 L18.2,2.3 L10.8,2.3 L0.8,2.3 C0.5,2.3 0.2,2.6 0.2,2.9 L0.2,118.3 C0.2,118.6 0.5,118.9 0.8,118.9 L17.5,118.9 C17.8,118.9 18.1,118.6 18.1,118.3 L18.1,30.6 C18.1,29.9 19.1,29.8 19.3,30.4 L33.1,75.9 L34.1,79.1 C34.2,79.4 34.4,79.5 34.7,79.5 L47.5,79.5 C47.8,79.5 48,79.3 48.1,79.1 L49.1,75.9 L62.9,30.4 C63.1,29.7 64.1,29.9 64.1,30.6 L64.1,118.3 C64.1,118.6 64.4,118.9 64.7,118.9 L81.4,118.9 C81.7,118.9 82,118.6 82,118.3 L82,2.9 C82,2.6 81.7,2.3 81.4,2.3 L71.6,2.3 Z" id="Shape"></path> - <path d="M541,2.3 C540.7,2.3 540.5,2.5 540.4,2.7 L526.7,47.9 C526.5,48.5 525.7,48.5 525.5,47.9 L511.8,2.7 C511.7,2.4 511.5,2.3 511.2,2.3 L485.8,2.3 C485.5,2.3 485.2,2.6 485.2,2.9 L485.2,118.3 C485.2,118.6 485.5,118.9 485.8,118.9 L502.5,118.9 C502.8,118.9 503.1,118.6 503.1,118.3 L503.1,30.6 C503.1,29.9 504.1,29.8 504.3,30.4 L518.1,75.9 L519.1,79.1 C519.2,79.4 519.4,79.5 519.7,79.5 L532.5,79.5 C532.8,79.5 533,79.3 533.1,79.1 L534.1,75.9 L547.9,30.4 C548.1,29.7 549.1,29.9 549.1,30.6 L549.1,118.3 C549.1,118.6 549.4,118.9 549.7,118.9 L566.4,118.9 C566.7,118.9 567,118.6 567,118.3 L567,2.9 C567,2.6 566.7,2.3 566.4,2.3 L541,2.3 Z" id="Shape"></path> - <path d="M325.6,2.3 L294.5,2.3 L277.8,2.3 L246.7,2.3 C246.4,2.3 246.1,2.6 246.1,2.9 L246.1,17.3 C246.1,17.6 246.4,17.9 246.7,17.9 L277.2,17.9 L277.2,118.3 C277.2,118.6 277.5,118.9 277.8,118.9 L294.5,118.9 C294.8,118.9 295.1,118.6 295.1,118.3 L295.1,17.9 L325.6,17.9 C325.9,17.9 326.2,17.6 326.2,17.3 L326.2,2.9 C326.2,2.6 326,2.3 325.6,2.3 Z" id="Shape"></path> - <path d="M424.1,118.9 L439.3,118.9 C439.7,118.9 440,118.5 439.9,118.1 L408.5,2.3 C408.4,2 408.2,1.9 407.9,1.9 L402.1,1.9 L391.9,1.9 L386.1,1.9 C385.8,1.9 385.6,2.1 385.5,2.3 L354.1,118.1 C354,118.5 354.3,118.9 354.7,118.9 L369.9,118.9 C370.2,118.9 370.4,118.7 370.5,118.5 L379.6,84.8 C379.7,84.5 379.9,84.4 380.2,84.4 L413.8,84.4 C414.1,84.4 414.3,84.6 414.4,84.8 L423.5,118.5 C423.6,118.7 423.9,118.9 424.1,118.9 Z M384.2,67.9 L396.4,22.8 C396.6,22.2 397.4,22.2 397.6,22.8 L409.8,67.9 C409.9,68.3 409.6,68.7 409.2,68.7 L384.8,68.7 C384.4,68.7 384.1,68.3 384.2,67.9 Z" id="Shape"></path> - <path d="M683.3,118.9 L698.5,118.9 C698.9,118.9 699.2,118.5 699.1,118.1 L667.7,2.3 C667.6,2 667.4,1.9 667.1,1.9 L661.3,1.9 L651.1,1.9 L645.3,1.9 C645,1.9 644.8,2.1 644.7,2.3 L613.3,118.1 C613.2,118.5 613.5,118.9 613.9,118.9 L629.1,118.9 C629.4,118.9 629.6,118.7 629.7,118.5 L638.8,84.8 C638.9,84.5 639.1,84.4 639.4,84.4 L673,84.4 C673.3,84.4 673.5,84.6 673.6,84.8 L682.7,118.5 C682.8,118.7 683,118.9 683.3,118.9 Z M643.4,67.9 L655.6,22.8 C655.8,22.2 656.6,22.2 656.8,22.8 L669,67.9 C669.1,68.3 668.8,68.7 668.4,68.7 L644,68.7 C643.6,68.7 643.3,68.3 643.4,67.9 Z" id="Shape"></path> - <path d="M149.8,101.8 L149.8,66 C149.8,65.7 150.1,65.4 150.4,65.4 L194.9,65.4 C195.2,65.4 195.5,65.1 195.5,64.8 L195.5,50.4 C195.5,50.1 195.2,49.8 194.9,49.8 L150.4,49.8 C150.1,49.8 149.8,49.5 149.8,49.2 L149.8,18.6 C149.8,18.3 150.1,18 150.4,18 L201,18 C201.3,18 201.6,17.7 201.6,17.4 L201.6,3 C201.6,2.7 201.3,2.4 201,2.4 L149.8,2.4 L132.5,2.4 C132.2,2.4 131.9,2.7 131.9,3 L131.9,18 L131.9,49.9 L131.9,65.5 L131.9,102.5 L131.9,118.3 C131.9,118.6 132.2,118.9 132.5,118.9 L149.8,118.9 L203.1,118.9 C203.4,118.9 203.7,118.6 203.7,118.3 L203.7,103.1 C203.7,102.8 203.4,102.5 203.1,102.5 L150.3,102.5 C150,102.4 149.8,102.2 149.8,101.8 Z" id="Shape"></path> - <path d="M949.3,117.9 L891.5,58.2 C891.3,58 891.3,57.6 891.5,57.4 L943.5,3.4 C943.9,3 943.6,2.4 943.1,2.4 L921.8,2.4 C921.6,2.4 921.5,2.5 921.4,2.6 L877.3,48.4 C876.9,48.8 876.3,48.5 876.3,48 L876.3,3 C876.3,2.7 876,2.4 875.7,2.4 L859,2.4 C858.7,2.4 858.4,2.7 858.4,3 L858.4,118.4 C858.4,118.7 858.7,119 859,119 L875.7,119 C876,119 876.3,118.7 876.3,118.4 L876.3,67.6 C876.3,67.1 877,66.8 877.3,67.2 L927.3,118.8 C927.4,118.9 927.6,119 927.7,119 L949,119 C949.4,118.9 949.7,118.2 949.3,117.9 Z" id="Shape"></path> - </g> - <g id="Group" stroke-linecap="round" stroke-linejoin="round"> - <polygon id="Shape" stroke="#E17726" fill="#E17726" points="246.1 0.2 145 75.2 163.8 31"></polygon> - <g transform="translate(2.000000, 0.000000)" fill="#E27625" id="Shape" stroke="#E27625"> - <polygon points="10.9 0.2 111.1 75.9 93.2 31"></polygon> - <polygon points="207.7 174.1 180.8 215.3 238.4 231.2 254.9 175"></polygon> - <polygon points="0.2 175 16.6 231.2 74.1 215.3 47.3 174.1"></polygon> - <polygon points="71 104.5 55 128.7 112 131.3 110.1 69.8"></polygon> - <polygon points="184 104.5 144.3 69.1 143 131.3 200 128.7"></polygon> - <polygon points="74.1 215.3 108.6 198.6 78.9 175.4"></polygon> - <polygon points="146.4 198.6 180.8 215.3 176.1 175.4"></polygon> - </g> - <g transform="translate(76.000000, 198.000000)" fill="#D5BFB2" id="Shape" stroke="#D5BFB2"> - <polygon points="106.8 17.3 72.4 0.6 75.2 23 74.9 32.5"></polygon> - <polygon points="0.1 17.3 32.1 32.5 31.9 23 34.6 0.6"></polygon> - </g> - <polygon id="Shape" stroke="#233447" fill="#233447" points="108.7 160.6 80.1 152.2 100.3 142.9"></polygon> - <polygon id="Shape" stroke="#233447" fill="#233447" points="150.3 160.6 158.7 142.9 179 152.2"></polygon> - <g transform="translate(49.000000, 128.000000)" fill="#CC6228" id="Shape" stroke="#CC6228"> - <polygon points="27.1 87.3 32.1 46.1 0.3 47"></polygon> - <polygon points="128.9 46.1 133.8 87.3 160.7 47"></polygon> - <polygon points="153 0.7 96 3.3 101.3 32.6 109.7 14.9 130 24.2"></polygon> - <polygon points="31.1 24.2 51.3 14.9 59.7 32.6 65 3.3 8 0.7"></polygon> - </g> - <g transform="translate(57.000000, 128.000000)" fill="#E27525" id="Shape" stroke="#E27525"> - <polygon points="0 0.7 23.9 47.4 23.1 24.2"></polygon> - <polygon points="122 24.2 121.1 47.4 145 0.7"></polygon> - <polygon points="57 3.3 51.7 32.6 58.4 67.2 59.9 21.6"></polygon> - <polygon points="88 3.3 85.2 21.5 86.6 67.2 93.3 32.6"></polygon> - </g> - <polygon id="Shape" stroke="#F5841F" fill="#F5841F" points="150.3 160.6 143.6 195.2 148.4 198.6 178.1 175.4 179 152.2"></polygon> - <polygon id="Shape" stroke="#F5841F" fill="#F5841F" points="80.1 152.2 80.9 175.4 110.6 198.6 115.4 195.2 108.7 160.6"></polygon> - <polygon id="Shape" stroke="#C0AC9D" fill="#C0AC9D" points="150.9 230.5 151.2 221 148.6 218.8 110.4 218.8 107.9 221 108.1 230.5 76.1 215.3 87.3 224.5 110 240.2 148.9 240.2 171.7 224.5 182.8 215.3"></polygon> - <polygon id="Shape" stroke="#161616" fill="#161616" points="148.4 198.6 143.6 195.2 115.4 195.2 110.6 198.6 107.9 221 110.4 218.8 148.6 218.8 151.2 221"></polygon> - <g fill="#763E1A" id="Shape" stroke="#763E1A"> - <polygon points="250.4 80.1 258.9 38.7 246.1 0.2 148.4 72.7 186 104.5 239.1 120 250.8 106.3 245.7 102.6 253.8 95.2 247.6 90.4 255.7 84.2"></polygon> - <polygon points="0.1 38.7 8.7 80.1 3.2 84.2 11.4 90.4 5.2 95.2 13.3 102.6 8.2 106.3 19.9 120 73 104.5 110.6 72.7 12.9 0.2"></polygon> - </g> - <polygon id="Shape" stroke="#F5841F" fill="#F5841F" points="239.1 120 186 104.5 202 128.7 178.1 175.4 209.7 175 256.9 175"></polygon> - <polygon id="Shape" stroke="#F5841F" fill="#F5841F" points="73 104.5 19.9 120 2.2 175 49.3 175 80.9 175.4 57 128.7"></polygon> - <polygon id="Shape" stroke="#F5841F" fill="#F5841F" points="145 131.3 148.4 72.7 163.8 31 95.2 31 110.6 72.7 114 131.3 115.3 149.7 115.4 195.2 143.6 195.2 143.7 149.7"></polygon> - </g> - </g> - </g> -</svg>
\ No newline at end of file diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js index b0c742e1f..aec2bf560 100644 --- a/app/scripts/controllers/network/network.js +++ b/app/scripts/controllers/network/network.js @@ -44,7 +44,7 @@ const defaultProviderConfig = { } const defaultNetworkConfig = { - ticker: 'ETH', + ticker: 'TAN', } module.exports = class NetworkController extends EventEmitter { @@ -132,7 +132,7 @@ module.exports = class NetworkController extends EventEmitter { }) } - setRpcTarget (rpcTarget, chainId, ticker = 'ETH', nickname = '', rpcPrefs) { + setRpcTarget (rpcTarget, chainId, ticker = 'TAN', nickname = '', rpcPrefs) { const providerConfig = { type: 'rpc', rpcTarget, @@ -144,7 +144,7 @@ module.exports = class NetworkController extends EventEmitter { this.providerConfig = providerConfig } - async setProviderType (type, rpcTarget = '', ticker = 'ETH', nickname = '') { + async setProviderType (type, rpcTarget = '', ticker = 'TAN', nickname = '') { console.log('1') assert.notEqual(type, 'rpc', `NetworkController - cannot call "setProviderType" with type 'rpc'. use "setRpcTarget"`) console.log('2') diff --git a/app/scripts/controllers/token-rates.js b/app/scripts/controllers/token-rates.js index 9b86a9ebf..70b8f64c7 100644 --- a/app/scripts/controllers/token-rates.js +++ b/app/scripts/controllers/token-rates.js @@ -30,7 +30,7 @@ class TokenRatesController { async updateExchangeRates () { if (!this.isActive) { return } const contractExchangeRates = {} - const nativeCurrency = this.currency ? this.currency.state.nativeCurrency.toLowerCase() : 'eth' + const nativeCurrency = this.currency ? this.currency.state.nativeCurrency.toLowerCase() : 'TAN' const pairs = this._tokens.map(token => token.address).join(',') const query = `contract_addresses=${pairs}&vs_currencies=${nativeCurrency}` if (this._tokens.length > 0) { diff --git a/gulpfile.js b/gulpfile.js index 35c6331e8..e8bdf343b 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -482,7 +482,7 @@ gulp.task('dist', function zipTask (target) { return () => { return gulp.src(`dist/${target}/**`) - .pipe(zip(`metamask-${target}-${manifest.version}.zip`)) + .pipe(zip(`tangerine-${target}-${manifest.version}.zip`)) .pipe(gulp.dest('builds')) } } diff --git a/ui/app/components/app/dropdowns/network-dropdown.js b/ui/app/components/app/dropdowns/network-dropdown.js index 8563f0771..78039ce4a 100644 --- a/ui/app/components/app/dropdowns/network-dropdown.js +++ b/ui/app/components/app/dropdowns/network-dropdown.js @@ -334,7 +334,7 @@ NetworkDropdown.prototype.renderCommonRpc = function (rpcListDetail, provider) { return reversedRpcListDetail.map((entry) => { const rpc = entry.rpcUrl - const ticker = entry.ticker || 'ETH' + const ticker = entry.ticker || 'TAN' const nickname = entry.nickname || '' const currentRpcTarget = provider.type === 'rpc' && rpc === provider.rpcTarget diff --git a/ui/app/components/app/token-cell.js b/ui/app/components/app/token-cell.js index 495b9502b..4a632efff 100644 --- a/ui/app/components/app/token-cell.js +++ b/ui/app/components/app/token-cell.js @@ -168,7 +168,7 @@ function navigateTo (url) { function etherscanLinkFor (tokenAddress, address, network) { const prefix = prefixForNetwork(network) - return `https://${prefix}etherscan.io/token/${tokenAddress}?a=${address}` + return `https://${prefix}tangerine.garden/address/${tokenAddress}?a=${address}` } function tokenFactoryFor (tokenAddress) { diff --git a/ui/app/helpers/constants/common.js b/ui/app/helpers/constants/common.js index a0d6e65b3..6641faaae 100644 --- a/ui/app/helpers/constants/common.js +++ b/ui/app/helpers/constants/common.js @@ -1,4 +1,4 @@ -export const ETH = 'ETH' +export const ETH = 'TAN' export const GWEI = 'GWEI' export const WEI = 'WEI' diff --git a/ui/app/helpers/utils/confirm-tx.util.js b/ui/app/helpers/utils/confirm-tx.util.js index 853427b31..92a1f668e 100644 --- a/ui/app/helpers/utils/confirm-tx.util.js +++ b/ui/app/helpers/utils/confirm-tx.util.js @@ -55,7 +55,7 @@ export function addFiat (...args) { export function getValueFromWeiHex ({ value, - fromCurrency = 'ETH', + fromCurrency = 'TAN', toCurrency, conversionRate, numberOfDecimals, @@ -75,7 +75,7 @@ export function getValueFromWeiHex ({ export function getTransactionFee ({ value, - fromCurrency = 'ETH', + fromCurrency = 'TAN', toCurrency, conversionRate, numberOfDecimals, @@ -101,7 +101,7 @@ export function formatCurrency (value, currencyCode) { export function convertTokenToFiat ({ value, - fromCurrency = 'ETH', + fromCurrency = 'TAN', toCurrency, conversionRate, contractExchangeRate, diff --git a/ui/app/helpers/utils/conversions.util.js b/ui/app/helpers/utils/conversions.util.js index 5e1c21ff7..44e11d996 100644 --- a/ui/app/helpers/utils/conversions.util.js +++ b/ui/app/helpers/utils/conversions.util.js @@ -105,7 +105,7 @@ export function decEthToConvertedCurrency (ethTotal, convertedCurrency, conversi return conversionUtil(ethTotal, { fromNumericBase: 'dec', toNumericBase: 'dec', - fromCurrency: 'ETH', + fromCurrency: 'TAN', toCurrency: convertedCurrency, numberOfDecimals: 2, conversionRate, diff --git a/ui/app/helpers/utils/transactions.util.js b/ui/app/helpers/utils/transactions.util.js index b65bda5b2..e99cc3ac0 100644 --- a/ui/app/helpers/utils/transactions.util.js +++ b/ui/app/helpers/utils/transactions.util.js @@ -225,5 +225,5 @@ export function getBlockExplorerUrlForTx (networkId, hash, rpcPrefs = {}) { return `${rpcPrefs.blockExplorerUrl}/tx/${hash}` } const prefix = prefixForNetwork(networkId) - return `https://${prefix}etherscan.io/tx/${hash}` + return `https://${prefix}tangerine.garden/transaction/${hash}` } diff --git a/ui/app/helpers/utils/util.js b/ui/app/helpers/utils/util.js index 94fa9ad42..5f9856965 100644 --- a/ui/app/helpers/utils/util.js +++ b/ui/app/helpers/utils/util.js @@ -137,7 +137,7 @@ function parseBalance (balance) { // Takes wei hex, returns an object with three properties. // Its "formatted" property is what we generally use to render values. -function formatBalance (balance, decimalsToKeep, needsParse = true, ticker = 'ETH') { +function formatBalance (balance, decimalsToKeep, needsParse = true, ticker = 'TAN') { var parsed = needsParse ? parseBalance(balance) : balance.split('.') var beforeDecimal = parsed[0] var afterDecimal = parsed[1] diff --git a/ui/app/pages/send/send-content/send-asset-row/send-asset-row.component.js b/ui/app/pages/send/send-content/send-asset-row/send-asset-row.component.js index de2d9462f..0716d1c22 100644 --- a/ui/app/pages/send/send-content/send-asset-row/send-asset-row.component.js +++ b/ui/app/pages/send/send-content/send-asset-row/send-asset-row.component.js @@ -45,7 +45,7 @@ export default class SendAssetRow extends Component { name: 'User clicks "Assets" dropdown', }, customVariables: { - assetSelected: address ? 'ERC20' : 'ETH', + assetSelected: address ? 'ERC20' : 'TAN', }, }) this.props.setSelectedToken(address) diff --git a/ui/app/pages/settings/advanced-tab/advanced-tab.component.js b/ui/app/pages/settings/advanced-tab/advanced-tab.component.js index 3d27fe349..7b2afa9f4 100644 --- a/ui/app/pages/settings/advanced-tab/advanced-tab.component.js +++ b/ui/app/pages/settings/advanced-tab/advanced-tab.component.js @@ -138,7 +138,7 @@ export default class AdvancedTab extends PureComponent { ) } - validateRpc (newRpc, chainId, ticker = 'ETH', nickname) { + validateRpc (newRpc, chainId, ticker = 'TAN', nickname) { const { setRpcTarget, displayWarning } = this.props if (validUrl.isWebUri(newRpc)) { this.context.metricsEvent({ diff --git a/ui/app/pages/settings/networks-tab/networks-tab.constants.js b/ui/app/pages/settings/networks-tab/networks-tab.constants.js index 1a49ca04f..6bcf5c802 100644 --- a/ui/app/pages/settings/networks-tab/networks-tab.constants.js +++ b/ui/app/pages/settings/networks-tab/networks-tab.constants.js @@ -1,48 +1,57 @@ const defaultNetworksData = [ + // { + // labelKey: 'mainnet', + // iconColor: '#29B6AF', + // providerType: 'mainnet', + // rpcUrl: 'https://api.infura.io/v1/jsonrpc/mainnet', + // chainId: '1', + // ticker: 'ETH', + // blockExplorerUrl: 'https://etherscan.io', + // }, + // { + // labelKey: 'ropsten', + // iconColor: '#FF4A8D', + // providerType: 'ropsten', + // rpcUrl: 'https://api.infura.io/v1/jsonrpc/ropsten', + // chainId: '3', + // ticker: 'ETH', + // blockExplorerUrl: 'https://ropsten.etherscan.io', + // }, + // { + // labelKey: 'kovan', + // iconColor: '#9064FF', + // providerType: 'kovan', + // rpcUrl: 'https://api.infura.io/v1/jsonrpc/kovan', + // chainId: '4', + // ticker: 'ETH', + // blockExplorerUrl: 'https://etherscan.io', + // }, + // { + // labelKey: 'rinkeby', + // iconColor: '#F6C343', + // providerType: 'rinkeby', + // rpcUrl: 'https://api.infura.io/v1/jsonrpc/rinkeby', + // chainId: '42', + // ticker: 'ETH', + // blockExplorerUrl: 'https://rinkeby.etherscan.io', + // }, + // { + // labelKey: 'goerli', + // iconColor: '#3099f2', + // providerType: 'goerli', + // rpcUrl: 'https://api.infura.io/v1/jsonrpc/goerli', + // chainId: '5', + // ticker: 'ETH', + // blockExplorerUrl: 'https://goerli.etherscan.io', + // }, { - labelKey: 'mainnet', - iconColor: '#29B6AF', - providerType: 'mainnet', - rpcUrl: 'https://api.infura.io/v1/jsonrpc/mainnet', - chainId: '1', - ticker: 'ETH', - blockExplorerUrl: 'https://etherscan.io', - }, - { - labelKey: 'ropsten', + labelKey: 'tangerine_testnet', iconColor: '#FF4A8D', - providerType: 'ropsten', - rpcUrl: 'https://api.infura.io/v1/jsonrpc/ropsten', - chainId: '3', - ticker: 'ETH', - blockExplorerUrl: 'https://ropsten.etherscan.io', - }, - { - labelKey: 'kovan', - iconColor: '#9064FF', - providerType: 'kovan', - rpcUrl: 'https://api.infura.io/v1/jsonrpc/kovan', - chainId: '4', - ticker: 'ETH', - blockExplorerUrl: 'https://etherscan.io', - }, - { - labelKey: 'rinkeby', - iconColor: '#F6C343', - providerType: 'rinkeby', - rpcUrl: 'https://api.infura.io/v1/jsonrpc/rinkeby', - chainId: '42', - ticker: 'ETH', - blockExplorerUrl: 'https://rinkeby.etherscan.io', - }, - { - labelKey: 'goerli', - iconColor: '#3099f2', - providerType: 'goerli', - rpcUrl: 'https://api.infura.io/v1/jsonrpc/goerli', - chainId: '5', - ticker: 'ETH', - blockExplorerUrl: 'https://goerli.etherscan.io', + providerType: 'tangerine_testnet', + rpcUrl: 'https://testnet-rpc.tangerine-network.io', + chainId: '374', + ticker: 'TAN', + blockExplorerUrl: 'https://testnet.tangerine.garden', }, { labelKey: 'localhost', diff --git a/ui/app/pages/unlock-page/unlock-page.component.js b/ui/app/pages/unlock-page/unlock-page.component.js index 4d0d5d782..36b46e548 100644 --- a/ui/app/pages/unlock-page/unlock-page.component.js +++ b/ui/app/pages/unlock-page/unlock-page.component.js @@ -152,14 +152,14 @@ export default class UnlockPage extends Component { <img style={{ height: '50px', - marginBottom: '40px', + marginBottom: '30px', }} src={'images/logo/metamask-logo-horizontal.svg'} /> </div> - <h1 className="unlock-page__title"> + {/* <h1 className="unlock-page__title"> { t('welcomeBack') } - </h1> + </h1> */} <div>{ t('unlockMessage') }</div> <form className="unlock-page__form" diff --git a/ui/app/selectors/custom-gas.js b/ui/app/selectors/custom-gas.js index 1f7ee8f9f..a1df738f6 100644 --- a/ui/app/selectors/custom-gas.js +++ b/ui/app/selectors/custom-gas.js @@ -238,10 +238,10 @@ function getRenderableBasicEstimateData (state, gasLimit) { const { gas: { basicEstimates: { - safeLow, + // safeLow, fast, fastest, - safeLowWait, + // safeLowWait, fastestWait, fastWait, }, @@ -249,15 +249,15 @@ function getRenderableBasicEstimateData (state, gasLimit) { } = state return [ - { - labelKey: 'slow', - feeInPrimaryCurrency: getRenderableEthFee(safeLow, gasLimit), - feeInSecondaryCurrency: showFiat - ? getRenderableConvertedCurrencyFee(safeLow, gasLimit, currentCurrency, conversionRate) - : '', - timeEstimate: safeLowWait && getRenderableTimeEstimate(safeLowWait), - priceInHexWei: getGasPriceInHexWei(safeLow), - }, + // { + // labelKey: 'slow', + // feeInPrimaryCurrency: getRenderableEthFee(safeLow, gasLimit), + // feeInSecondaryCurrency: showFiat + // ? getRenderableConvertedCurrencyFee(safeLow, gasLimit, currentCurrency, conversionRate) + // : '', + // timeEstimate: safeLowWait && getRenderableTimeEstimate(safeLowWait), + // priceInHexWei: getGasPriceInHexWei(safeLow), + // }, { labelKey: 'average', feeInPrimaryCurrency: getRenderableEthFee(fast, gasLimit), @@ -293,7 +293,7 @@ function getRenderableEstimateDataForSmallButtonsFromGWEI (state) { const { gas: { basicEstimates: { - safeLow, + // safeLow, fast, fastest, }, @@ -301,14 +301,14 @@ function getRenderableEstimateDataForSmallButtonsFromGWEI (state) { } = state return [ - { - labelKey: 'slow', - feeInSecondaryCurrency: showFiat - ? getRenderableConvertedCurrencyFee(safeLow, gasLimit, currentCurrency, conversionRate) - : '', - feeInPrimaryCurrency: getRenderableEthFee(safeLow, gasLimit, NUMBER_OF_DECIMALS_SM_BTNS, true), - priceInHexWei: getGasPriceInHexWei(safeLow, true), - }, + // { + // labelKey: 'slow', + // feeInSecondaryCurrency: showFiat + // ? getRenderableConvertedCurrencyFee(safeLow, gasLimit, currentCurrency, conversionRate) + // : '', + // feeInPrimaryCurrency: getRenderableEthFee(safeLow, gasLimit, NUMBER_OF_DECIMALS_SM_BTNS, true), + // priceInHexWei: getGasPriceInHexWei(safeLow, true), + // }, { labelKey: 'average', feeInSecondaryCurrency: showFiat diff --git a/ui/app/store/actions.js b/ui/app/store/actions.js index d3cc7efca..fd7423cf1 100644 --- a/ui/app/store/actions.js +++ b/ui/app/store/actions.js @@ -1982,7 +1982,7 @@ function setPreviousProvider (type) { } } -function updateAndSetCustomRpc (newRpc, chainId, ticker = 'ETH', nickname, rpcPrefs) { +function updateAndSetCustomRpc (newRpc, chainId, ticker = 'TAN', nickname, rpcPrefs) { return (dispatch) => { log.debug(`background.updateAndSetCustomRpc: ${newRpc} ${chainId} ${ticker} ${nickname}`) background.updateAndSetCustomRpc(newRpc, chainId, ticker, nickname || newRpc, rpcPrefs, (err) => { @@ -1998,7 +1998,7 @@ function updateAndSetCustomRpc (newRpc, chainId, ticker = 'ETH', nickname, rpcPr } } -function editRpc (oldRpc, newRpc, chainId, ticker = 'ETH', nickname, rpcPrefs) { +function editRpc (oldRpc, newRpc, chainId, ticker = 'TAN', nickname, rpcPrefs) { return (dispatch) => { log.debug(`background.delRpcTarget: ${oldRpc}`) background.delCustomRpc(oldRpc, (err) => { diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js index f2e321991..1760b9f76 100644 --- a/ui/lib/account-link.js +++ b/ui/lib/account-link.js @@ -24,6 +24,9 @@ module.exports = function (address, network, rpcPrefs) { case 5: // goerli test net link = `https://goerli.etherscan.io/address/${address}` break + case 374: + link = `https://testnet.tangerine.garden/address/${address}` + break default: link = '' break diff --git a/ui/lib/etherscan-prefix-for-network.js b/ui/lib/etherscan-prefix-for-network.js index ce194b0a8..aec4a2d33 100644 --- a/ui/lib/etherscan-prefix-for-network.js +++ b/ui/lib/etherscan-prefix-for-network.js @@ -17,6 +17,12 @@ module.exports = function (network) { case 5: // goerli test net prefix = 'goerli.' break + case 373: + prefix = '' + break + case 374: + prefix = 'testnet.' + break default: prefix = '' } |
