diff --git a/.gitignore b/.gitignore index 04f5aff9..8f82ce31 100644 --- a/.gitignore +++ b/.gitignore @@ -30,5 +30,4 @@ yarn-error.log* __pycache__/ # Ignore build releases. -oasis-wallet-*.zip -rose-wallet-*.zip +oasis-rose-wallet-*.zip diff --git a/Makefile b/Makefile index 776b6636..71a0c040 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ all: build # Build. build: - @$(ECHO) "$(MAGENTA)*** Building ROSE Wallet Browser Extension...$(OFF)" + @$(ECHO) "$(MAGENTA)*** Building Oasis ROSE Wallet Browser Extension...$(OFF)" @yarn buildProd # Lint code, commits and documentation. diff --git a/README.md b/README.md index 5ba44fc1..8941adf8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ROSE Wallet - Browser Extension +# Oasis ROSE Wallet - Browser Extension [![CI lint status][github-ci-lint-badge]][github-ci-lint-link] @@ -11,7 +11,7 @@ The official non-custodial browser extension wallet for the [Oasis Network]. ## Introduction -ROSE Wallet - Browser Extension provides a complete solution for managing your +Oasis ROSE Wallet - Browser Extension provides a complete solution for managing your ROSE tokens, including everything for convenient staking of your ROSE tokens. ## Features @@ -24,7 +24,7 @@ ROSE tokens, including everything for convenient staking of your ROSE tokens. - Import accounts directly from their private keys - Watch 3rd-party accounts - Address book of your saved accounts -- Easily switch between different Oasis wallets that use the same [ADR 0008] +- Easily switch between different Oasis ROSE wallets that use the same [ADR 0008] standard account key generation process. ### Transactions @@ -49,32 +49,29 @@ ROSE tokens, including everything for convenient staking of your ROSE tokens. The extension is roughly laid out this way: - background - the extension's background page - - APIService (wallet info storage, in-memory transaction signing, transaction submission) - - ExtDAppService (DApp interface, handles requests from xu-frame) + - APIService (wallet info storage, in-memory transaction signing, transaction submission) + - ExtDAppService (DApp interface, handles requests from xu-frame) - service-data - connections to the network and block explorer - - OASISSCAN (provided by [oasisscan](https://api.oasisscan.com/mainnet)) - - Oasis gRPC-web (provided by [oasisscan-grpc](https://grpc-mainnet.oasisscan.com)) + - OASISSCAN (provided by [oasisscan](https://api.oasisscan.com/mainnet)) + - Oasis gRPC-web (provided by [oasisscan-grpc](https://grpc-mainnet.oasisscan.com)) - popup - interactive parts - - pages (UI, Ledger transaction signing) - - actions (reducer action) - - reducer + - pages (UI, Ledger transaction signing) + - actions (reducer action) + - reducer - xu-frame - a page that DApps can load in an iframe to communicate with this extension - - code for this page is in background/ExtUtils.js - - Oasis SDK ext-utils handlers + - code for this page is in background/ExtUtils.js + - Oasis SDK ext-utils handlers [![Architecture Diagram](./docs/oasis-nomnoml.png)][1] - - - ## Getting started ### build extension -ROSE Wallet extension repo uses git-secret to encrypt the endpoints and the api keys. So, you can't build this without creating your own config file. You should create your own `config.js` file in the folder. Refer to the `config.example.js` sample file to create your own configuration. +Oasis ROSE Wallet extension repo uses git-secret to encrypt the endpoints and the api keys. So, you can't build this without creating your own config file. You should create your own `config.js` file in the folder. Refer to the `config.example.js` sample file to create your own configuration. ```sh yarn install @@ -85,11 +82,10 @@ yarn dev Extension's build output is placed in `/dist`, and you can check out [this page](https://developer.chrome.com/extensions/getstarted) for installing the developing extension. - ### dapp-connect test -* open [oasis-test-dapp](https://lukaw3d.github.io/oasis-test-dapp) -* click connect and other button to communicate with wallet +- open [oasis-test-dapp](https://lukaw3d.github.io/oasis-test-dapp) +- click connect and other button to communicate with wallet ## CI pipelines (Coming soon) @@ -107,7 +103,7 @@ COMMIT=`git rev-parse --short HEAD` rm -rf dist/ yarn install --frozen-lockfile yarn buildProd -zip -r rose-wallet-$VERSION-$COMMIT.zip dist/ +zip -r oasis-rose-wallet-$VERSION-$COMMIT.zip dist/ ``` If you're actually making a new release, follow the applicable steps in the diff --git a/config.js b/config.js index 2d55be18..ef3a583a 100644 --- a/config.js +++ b/config.js @@ -1,5 +1,5 @@ /** - * ROSE Wallet - Browser Extension's configuration. + * Oasis ROSE Wallet - Browser Extension's configuration. * * NOTE: If you intend to build a custom version of the extension, edit this * file appropriately and rebuild the extension. diff --git a/docs/release-process.md b/docs/release-process.md index 3747b522..883dd80f 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -1,6 +1,7 @@ # Release Process ## Determine the New Version + Extension versions may not have suffixes like "-rc1". We are incrementing patch versions to differentiate release candidate builds. @@ -11,12 +12,14 @@ Version 1.0.1 is also a release candidate at first. If no changes are needed, 1.0.1 becomes the first public release of 1.0. ## Set the New Version Throughout + You must update: - `package.json` - `public/manifest.json` ## Add a Change Log Section + Here's the [Change Log](../CHANGELOG.md). If there is an "Unreleased Changes" section, rename it to the new version. @@ -37,6 +40,7 @@ We especially encourage linking externally reported issues. If you feel like it, move one Change Log item to a section on top titled "Spotlight change". ## Propose the New Version + Commit the version changes and Change Log update with a message in the format `Prepare release `, ideally separate from any other changes. @@ -56,6 +60,7 @@ git push origin v$VERSION ``` ## Prepare an Unsigned Archive + Clean the output directory, build, and package: ```sh @@ -63,16 +68,17 @@ VERSION=`cat public/manifest.json | jq .version -r` rm -rf dist/ yarn install --frozen-lockfile yarn buildProd -zip -r rose-wallet-$VERSION.zip dist/ +zip -r oasis-rose-wallet-$VERSION.zip dist/ ``` Note: The zip file has no Git commit hash. ## Add a Pre-Release on GitHub + Create a tag and create a [new release](https://github.com/oasisprotocol/oasis-wallet-ext/releases/new) on GitHub. -Enter `ROSE Wallet Release Candidate` for the title. +Enter `Oasis ROSE Wallet Release Candidate` for the title. Our Change Log is a file under version control, so all we do is put the link in the description: @@ -92,16 +98,17 @@ _This step is for our web store account admins._ _Contact an admin if you don't have access._ Go to [Chrome Web Store Developer Dashboard](https://chrome.google.com/webstore/devconsole/), -browse to the _ROSE Wallet_ item, +browse to the _Oasis_ROSE Wallet_ item, select _Package_ in the side bar and choose _Upload new package_. ## Update GitHub Pre-Release + Change the title: ```diff --ROSE Wallet Release Candidate -+ROSE Wallet +-Oasis ROSE Wallet Release Candidate ++Oasis ROSE Wallet ``` Change the description: diff --git a/package.json b/package.json index 1ddf167b..19d3f325 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@oasisprotocol/rose-wallet-ext", + "name": "@oasisprotocol/oasis-rose-wallet-ext", "version": "1.13.0", "private": true, "scripts": { diff --git a/public/manifest.json b/public/manifest.json index 5426f598..d3b0e36a 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -24,7 +24,7 @@ "128": "img/oasis.png", "512": "img/oasis.png" }, - "default_title": "ROSE Wallet", + "default_title": "Oasis ROSE Wallet", "default_popup": "popup.html" }, "permissions": [ diff --git a/public/static/img/oasis.png b/public/static/img/oasis.png index d65392e2..a9520586 100644 Binary files a/public/static/img/oasis.png and b/public/static/img/oasis.png differ diff --git a/public/static/popup.html b/public/static/popup.html index 9d2475c1..f04c6691 100755 --- a/public/static/popup.html +++ b/public/static/popup.html @@ -2,7 +2,7 @@ - ROSE Wallet + Oasis ROSE Wallet diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 66f49a32..7e4afe9b 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -1,6 +1,6 @@ { "appName": { - "message": "ROSE Wallet", + "message": "Oasis ROSE Wallet", "description": "The name of the application" }, "appDescription": { diff --git a/src/assets/images/Rose Wallet Logo Blue cropped.svg b/src/assets/images/Rose Wallet Logo Blue cropped.svg new file mode 100644 index 00000000..3505c231 --- /dev/null +++ b/src/assets/images/Rose Wallet Logo Blue cropped.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/accountEnter_hover.svg b/src/assets/images/accountEnter_hover.svg index aefaed77..c5859663 100644 --- a/src/assets/images/accountEnter_hover.svg +++ b/src/assets/images/accountEnter_hover.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/images/accountEnter_normal.svg b/src/assets/images/accountEnter_normal.svg index 8fd86b5d..9d1897ee 100644 --- a/src/assets/images/accountEnter_normal.svg +++ b/src/assets/images/accountEnter_normal.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/images/blueArrow.svg b/src/assets/images/blueArrow.svg index 6f5e4727..3305c4d9 100644 --- a/src/assets/images/blueArrow.svg +++ b/src/assets/images/blueArrow.svg @@ -2,7 +2,7 @@ 路径 - + diff --git a/src/assets/images/dapp_connect_hover.svg b/src/assets/images/dapp_connect_hover.svg index ab18d1d6..e5c889f8 100644 --- a/src/assets/images/dapp_connect_hover.svg +++ b/src/assets/images/dapp_connect_hover.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/images/dapp_connect_normal.svg b/src/assets/images/dapp_connect_normal.svg index 97651e2e..a48f0946 100644 --- a/src/assets/images/dapp_connect_normal.svg +++ b/src/assets/images/dapp_connect_normal.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/images/home_logo.png b/src/assets/images/home_logo.png deleted file mode 100644 index 6ee5a757..00000000 Binary files a/src/assets/images/home_logo.png and /dev/null differ diff --git a/src/assets/images/oasisIcon.svg b/src/assets/images/oasisIcon.svg index 4ff79d55..82aa6c29 100644 --- a/src/assets/images/oasisIcon.svg +++ b/src/assets/images/oasisIcon.svg @@ -1,11 +1,6 @@ - - Fill-1 - - - - - - - - \ No newline at end of file + + + + + diff --git a/src/assets/images/paratime_active.svg b/src/assets/images/paratime_active.svg index dba41f22..93683039 100644 --- a/src/assets/images/paratime_active.svg +++ b/src/assets/images/paratime_active.svg @@ -2,7 +2,7 @@ 模块 - + diff --git a/src/assets/images/txSend.svg b/src/assets/images/txSend.svg index dadeaac2..f3896f8f 100644 --- a/src/assets/images/txSend.svg +++ b/src/assets/images/txSend.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/images/wallet_send.png b/src/assets/images/wallet_send.png index e0d55c07..aa92a799 100644 Binary files a/src/assets/images/wallet_send.png and b/src/assets/images/wallet_send.png differ diff --git a/src/i18n/en.json b/src/i18n/en.json index 242c64da..7affe6c1 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -49,7 +49,7 @@ "confirmDepositingToParatimeToLedgerAccount": "Destination account was imported from Ledger! Ledger accounts do not support withdrawing from ParaTime.", "txHash": "Transaction Hash", "receiveTitle": "Receive", - "walletAddress": "Wallet Address", + "walletAddress": "ROSE Wallet Address", "copySuccess": "Copied to Clipboard", "accountManage": "Account Management", "createAccount": "Create", @@ -97,7 +97,7 @@ "accountImport": "Import", "postSuccess": "Transaction Submitted", "startHome": "Start", - "walletName": "ROSE Wallet", + "walletName": "Oasis ROSE Wallet", "privateError": "Wrong private key", "importRepeat": "Do not import repeatedly", "confirmDeleteNode": "Delete confirmation", @@ -168,6 +168,7 @@ "reclaim":"Undelegate", "nodeDetail":"Validator Info", "qrTip":"Scan the QR code and transfer ", + "tokens": "tokens", "getDetailInExplorer":"View transaction records through explorer.", "inputToAddress":"Please enter receive address", "observeAccountTip":"Watch Address", @@ -237,7 +238,7 @@ "txError":"Abnormal transaction", "userReject":"user reject", "webApprove":"Approve", - "walletConnect":"Connect by ROSE Wallet", + "walletConnect":"Connect by Oasis ROSE Wallet", "sign":"Signature", "waitNonce":"Checking Nonce", "connectFirst":"Please connect first", @@ -245,7 +246,7 @@ "dappDisconnect":"Disconnect", "disconnectSuccess":"Disconnect Success", "followConnect":"You have {{number}} accounts connected to the website.", - "needConnectTip":"ROSE Wallet is not connected to this website. To connect to this website please find the connect button in the website.", + "needConnectTip":"Oasis ROSE Wallet is not connected to this website. To connect to this website please find the connect button in the website.", "selectFirst":"Please Select connect address", "connectSuccess":"Connect Success", diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json index df183639..f34b75ac 100644 --- a/src/i18n/zh_CN.json +++ b/src/i18n/zh_CN.json @@ -161,6 +161,7 @@ "reclaim":"解除", "nodeDetail":"节点详情", "qrTip":"扫描二维码，转入", + "tokens": "代币", "getDetailInExplorer":"去浏览器查看详细信息", "inputToAddress":"请输入您的接收地址", "observeAccountTip":"该地址为观察地址", @@ -237,7 +238,7 @@ "dappDisconnect":"未连接", "disconnectSuccess":"断开连接成功", "followConnect":"您有 {{number}} 个账户连接到了该网站。", - "needConnectTip":"ROSE Wallet 没有连接到这个网站。要连接到此网站请在网站中找到连接按钮。", + "needConnectTip":"Oasis ROSE Wallet 没有连接到这个网站。要连接到此网站请在网站中找到连接按钮。", "selectFirst":"请先选择需要连接的地址", "connectSuccess":"连接成功", "changeToAccount":"切换至该账户", diff --git a/src/popup/common.scss b/src/popup/common.scss index 0f8128f4..7e8ef4be 100644 --- a/src/popup/common.scss +++ b/src/popup/common.scss @@ -14,15 +14,12 @@ $font-size-desc: 12px; $font-size-small: 10px; - $page-margin-top: 0px; - $modal-width: 290px; $bigger-btn-width: 315px; - $app-height: 600px; $app-width: 450px; @@ -30,25 +27,25 @@ $app-width: 450px; $color-danger: #ff2a7f; .click-cursor { - cursor: pointer; + cursor: pointer; } .click-cursor-disable { - cursor: not-allowed; + cursor: not-allowed; } .mne-item { - display: inline-block; - padding: 8px 15px; - margin: 5px 10px 5px 0; - - background: rgba(34, 109, 255, 0.1); - border-radius: 5px; - font-size: $font-size-content; - line-height: 13px; - font-weight: 400; + display: inline-block; + padding: 8px 15px; + margin: 5px 10px 5px 0; + + background: rgba(34, 109, 255, 0.1); + border-radius: 5px; + font-size: $font-size-content; + line-height: 13px; + font-weight: 400; } .ticker { - color: #0092F6; + color: #0500e2; } diff --git a/src/popup/component/Button/index.scss b/src/popup/component/Button/index.scss index dfbfd6a3..a8b93558 100644 --- a/src/popup/component/Button/index.scss +++ b/src/popup/component/Button/index.scss @@ -5,7 +5,7 @@ $common-btn-width: 120px; .common-button { width: $bigger-btn-width; height: 44px; - background: #226dff; + background: #0500e2; border-radius: 10px; border: 0px; @@ -38,7 +38,7 @@ $common-btn-width: 120px; } .home-send-btn { background: rgba(34, 109, 255, 0.2); - color: #226dff; + color: #0500e2; position: relative; } .paratime-disable-btn { @@ -55,9 +55,9 @@ $common-btn-width: 120px; .welcome-create-button { width: 295px; height: 44px; - background: #226dff; + background: #0500e2; border-radius: 10px; - border: 1px solid #226dff; + border: 1px solid #0500e2; font-size: $font-size-content; @@ -69,13 +69,13 @@ $common-btn-width: 120px; width: 295px; height: 44px; border-radius: 10px; - border: 1px solid #226dff; + border: 1px solid #0500e2; background: #fff; font-size: $font-size-content; font-weight: 500; - color: #226dff; + color: #0500e2; line-height: 20px; margin-top: 20px; diff --git a/src/popup/component/NewExtensionWarning/index.scss b/src/popup/component/NewExtensionWarning/index.scss index e3b32880..169c4f53 100644 --- a/src/popup/component/NewExtensionWarning/index.scss +++ b/src/popup/component/NewExtensionWarning/index.scss @@ -21,6 +21,6 @@ margin: 0; cursor: pointer; font: inherit; - color: #0092f6; + color: #0500e2; } } diff --git a/src/popup/component/TabsTop/index.scss b/src/popup/component/TabsTop/index.scss index 86c917e0..495fcabd 100644 --- a/src/popup/component/TabsTop/index.scss +++ b/src/popup/component/TabsTop/index.scss @@ -27,7 +27,7 @@ margin-top: 5px; } .tab-top-lab-indictor-active { - background: #226dff; + background: #0500e2; } .tab_content_wrap_top { width: 100%; diff --git a/src/popup/component/TextInput/index.scss b/src/popup/component/TextInput/index.scss index 3d0cb09f..cb756e8f 100644 --- a/src/popup/component/TextInput/index.scss +++ b/src/popup/component/TextInput/index.scss @@ -44,7 +44,7 @@ padding: 0px 40px 0px 10px; &:focus{ - border: 1px solid #226DFF; + border: 1px solid #0500e2; } } diff --git a/src/popup/component/WalletBar/index.js b/src/popup/component/WalletBar/index.js index 89779727..7ba4ba80 100644 --- a/src/popup/component/WalletBar/index.js +++ b/src/popup/component/WalletBar/index.js @@ -1,7 +1,7 @@ import cx from "classnames"; import React from "react"; import { connect } from "react-redux"; -import home_logo from "../../../assets/images/home_logo.png"; +import logo from "../../../assets/images/Rose Wallet Logo Blue cropped.svg"; import { saveLocal } from "../../../background/storage/localStorage"; import { NETWORK_CONFIG } from "../../../constant/storageKey"; import { updateNetConfigRequest } from "../../../reducers/cache"; @@ -117,7 +117,7 @@ class WalletBar extends React.Component { const { disableAccountSelect } = this.props return (
- + {this.renderNetMenu()}
{ return (
- -

{getLanguage('walletName')}

+

{VERSION_CONFIG}

) } diff --git a/src/popup/pages/AboutUs/index.scss b/src/popup/pages/AboutUs/index.scss index 43fcd439..6ceaac1a 100644 --- a/src/popup/pages/AboutUs/index.scss +++ b/src/popup/pages/AboutUs/index.scss @@ -10,14 +10,8 @@ text-align: center; } .about-home-logo { - width: 100px; -} -.about-wallet-name { - margin: 6px 0px; - font-size: $font-size-middle-title; - font-weight: 500; - color: #2c3451; - line-height: 28px; + width: 223px; + height: 50px; } .about-wallet-version { margin: 0; diff --git a/src/popup/pages/AccountManage/index.scss b/src/popup/pages/AccountManage/index.scss index f9facf8c..0194b98e 100644 --- a/src/popup/pages/AccountManage/index.scss +++ b/src/popup/pages/AccountManage/index.scss @@ -93,7 +93,7 @@ } .account-btn-item-create{ background: rgba(34, 109, 255, 0.1); - color: #226dff; + color: #0500e2; } .account-btn-item-import{ background: rgba(10, 199, 255, 0.1); @@ -157,7 +157,7 @@ margin: 0; font-size: $font-size-desc; color: #ffffff; - background: rgba(34, 109, 255, 1); + background: #0500e2; padding: 2px 6px; border-radius: 4px; } diff --git a/src/popup/pages/AddressBook/index.scss b/src/popup/pages/AddressBook/index.scss index ec9cd127..dd73e113 100644 --- a/src/popup/pages/AddressBook/index.scss +++ b/src/popup/pages/AddressBook/index.scss @@ -64,7 +64,7 @@ line-height: 20px; outline: none; &:focus { - border: 1px solid #226dff; + border: 1px solid #0500e2; } } diff --git a/src/popup/pages/ImportAccount/index.scss b/src/popup/pages/ImportAccount/index.scss index ed0b2b8d..4493cb9a 100644 --- a/src/popup/pages/ImportAccount/index.scss +++ b/src/popup/pages/ImportAccount/index.scss @@ -29,7 +29,7 @@ line-height: 20px; outline: none; &:focus { - border: 1px solid #226dff; + border: 1px solid #0500e2; } .text-area-input::placeholder { font-size: $font-size-content; diff --git a/src/popup/pages/LedgerAddresses/index.scss b/src/popup/pages/LedgerAddresses/index.scss index e900f704..fd2cc76a 100644 --- a/src/popup/pages/LedgerAddresses/index.scss +++ b/src/popup/pages/LedgerAddresses/index.scss @@ -52,7 +52,7 @@ } .address-page-button { font-size: $font-size-desc; - color: #226dff; + color: #0500e2; line-height: 16px; margin: 0px 10px; padding: 4px 4px; diff --git a/src/popup/pages/LedgerConnect/index.scss b/src/popup/pages/LedgerConnect/index.scss index 0d64c64f..940ae7ec 100644 --- a/src/popup/pages/LedgerConnect/index.scss +++ b/src/popup/pages/LedgerConnect/index.scss @@ -35,7 +35,7 @@ } .ledger-item-container-success { background-color: rgba(34, 109, 255, 0.1); - border: 1px solid #226dff; + border: 1px solid #0500e2; } .ledger-item-container-open { background-color: white; @@ -64,7 +64,7 @@ color: #7080b5; } .ledger-item-left-success { - background: #226dff; + background: #0500e2; color: #ffffff; } diff --git a/src/popup/pages/Lock/index.js b/src/popup/pages/Lock/index.js index bcbd39a8..06e50f3a 100644 --- a/src/popup/pages/Lock/index.js +++ b/src/popup/pages/Lock/index.js @@ -1,7 +1,7 @@ import cx from "classnames"; import React from "react"; import { connect } from "react-redux"; -import home_logo from "../../../assets/images/home_logo.png"; +import logo from "../../../assets/images/Rose Wallet Logo Blue cropped.svg"; import txFailed from "../../../assets/images/txFailed.png"; import { clearLocalExcept, getLocal } from "../../../background/storage/localStorage"; import { clearStorage } from "../../../background/storage/storageService"; @@ -238,7 +238,7 @@ class LockPage extends React.Component {
)}
- +
{this.renderPwdInput()}
diff --git a/src/popup/pages/Lock/index.scss b/src/popup/pages/Lock/index.scss index a0c57d0e..d2fa5090 100644 --- a/src/popup/pages/Lock/index.scss +++ b/src/popup/pages/Lock/index.scss @@ -22,9 +22,9 @@ text-align: center; } .lock-home-logo { - width: 75px; + width: 334px; height: 75px; -} + } .lock-welcome-content { margin: 0; font-size: $font-size-title-big; diff --git a/src/popup/pages/NetInfoPage/index.scss b/src/popup/pages/NetInfoPage/index.scss index 15c776a9..328db4f8 100644 --- a/src/popup/pages/NetInfoPage/index.scss +++ b/src/popup/pages/NetInfoPage/index.scss @@ -18,8 +18,8 @@ border-radius: 10px; padding: 2px 10px; background: rgba(34, 109, 255, 0.1); - border: 1px solid #226dff; - color: #226dff; + border: 1px solid #0500e2; + color: #0500e2; } .network-name-container-custom{ diff --git a/src/popup/pages/NodeDetail/index.scss b/src/popup/pages/NodeDetail/index.scss index 97f362c3..7eb30e0d 100644 --- a/src/popup/pages/NodeDetail/index.scss +++ b/src/popup/pages/NodeDetail/index.scss @@ -63,7 +63,7 @@ font-size: $font-size-content; font-weight: 400; - color: rgba(34, 109, 255, 1); + color: #0500e2; line-height: 20px; } diff --git a/src/popup/pages/Receive/index.js b/src/popup/pages/Receive/index.js index cd9009a1..dd54af33 100644 --- a/src/popup/pages/Receive/index.js +++ b/src/popup/pages/Receive/index.js @@ -2,7 +2,7 @@ import qrCode from 'qrcode-generator'; import React from "react"; import { connect } from "react-redux"; import copy_address from "../../../assets/images/copy_address.png"; -import home_logo from "../../../assets/images/home_logo.png"; +import logo from "../../../assets/images/Rose Wallet Logo Blue cropped.svg"; import { getLanguage } from "../../../i18n"; import { copyText, getPrettyAddress } from '../../../utils/utils'; import CustomView from "../../component/CustomView"; @@ -46,7 +46,7 @@ class ReceivePage extends React.Component { renderQrTip = () => { let symbol = this.props.netConfig.currentSymbol return (
-

{getLanguage('qrTip')}{symbol}

+

{getLanguage('qrTip')}{symbol} {getLanguage('tokens')}

) } renderAddressTip = () => { @@ -61,7 +61,7 @@ class ReceivePage extends React.Component { propsClassName={'receive-background'} history={this.props.history}>
- +
{this.renderQrTip()} {this.renderQrView()} diff --git a/src/popup/pages/Receive/index.scss b/src/popup/pages/Receive/index.scss index 1af30288..cd1fe0a6 100644 --- a/src/popup/pages/Receive/index.scss +++ b/src/popup/pages/Receive/index.scss @@ -21,7 +21,7 @@ font-size: $font-size-content; font-weight: 400; - color: #226dff; + color: #0500e2; line-height: 21px; margin-left: 16px; word-wrap: break-word; @@ -36,7 +36,8 @@ margin-top: 32px; } .receive-home-logo { - width: 59px; + width: 223px; + height: 50px; } .receive-background { diff --git a/src/popup/pages/Send/index.scss b/src/popup/pages/Send/index.scss index 8b522023..e8e561d7 100644 --- a/src/popup/pages/Send/index.scss +++ b/src/popup/pages/Send/index.scss @@ -124,7 +124,7 @@ p { } .send-amount-all{ font-size: $font-size-desc; - color: #226DFF; + color: #0500e2; line-height: 18px; padding-left: 4px; } diff --git a/src/popup/pages/ShowMnemonic/index.scss b/src/popup/pages/ShowMnemonic/index.scss index a2904429..a5efa216 100644 --- a/src/popup/pages/ShowMnemonic/index.scss +++ b/src/popup/pages/ShowMnemonic/index.scss @@ -19,5 +19,5 @@ } .mne-item-common { - color: #226dff; + color: #0500e2; } diff --git a/src/popup/pages/Staking/index.scss b/src/popup/pages/Staking/index.scss index 2e7af427..9a685fa1 100644 --- a/src/popup/pages/Staking/index.scss +++ b/src/popup/pages/Staking/index.scss @@ -89,7 +89,7 @@ position: relative; } .stake-percent-progress-actual { - background: #226dff; + background: #0500e2; border-radius: 3px; height: 7px; position: absolute; @@ -160,7 +160,7 @@ } .stake-validator-active { background: rgba(34, 109, 255, 0.1); - border: 1px solid #226dff; + border: 1px solid #0500e2; } .stake-validator-inactive { background: rgba(255, 146, 0, 0.1); @@ -171,7 +171,7 @@ font-weight: 400; } .stake-validator-status-text-active { - color: #226dff; + color: #0500e2; } .stake-validator-status-text-inactive { color: rgba(255, 146, 0, 1); @@ -347,7 +347,7 @@ line-height: 18px; } .stake-item-escrow { - background: #226dff; + background: #0500e2; border-radius: 4px; padding: 2px 13px; diff --git a/src/popup/pages/Wallet/index.scss b/src/popup/pages/Wallet/index.scss index 4a1d5e0b..475f453f 100644 --- a/src/popup/pages/Wallet/index.scss +++ b/src/popup/pages/Wallet/index.scss @@ -189,7 +189,7 @@ } .dapp-connect-item-status{ font-size: $font-size-desc; - color: #226DFF; + color: #0500e2; line-height: 16px; } @@ -214,7 +214,7 @@ } .dapp-connect-item-change{ font-size: $font-size-desc; - color: #226DFF; + color: #0500e2; line-height: 16px; } diff --git a/src/popup/pages/Welcome/index.js b/src/popup/pages/Welcome/index.js index f03a0b90..44758010 100644 --- a/src/popup/pages/Welcome/index.js +++ b/src/popup/pages/Welcome/index.js @@ -1,7 +1,7 @@ import React from "react"; import { connect } from "react-redux"; import { withRouter } from "react-router-dom"; -import home_logo from "../../../assets/images/home_logo.png"; +import logo from "../../../assets/images/Rose Wallet Logo Blue cropped.svg"; import { get } from "../../../background/storage/storageService"; import { changeLanguage, @@ -85,8 +85,7 @@ class Welcome extends React.Component { return (
{this.props.showNewExtensionWarning && }
- -

{getLanguage('walletName')}

+ {this.renderLanMenu()}

{getLanguage('walletIntro')}

diff --git a/src/popup/pages/Welcome/index.scss b/src/popup/pages/Welcome/index.scss index cb90b6c4..db340111 100644 --- a/src/popup/pages/Welcome/index.scss +++ b/src/popup/pages/Welcome/index.scss @@ -13,14 +13,9 @@ text-align: center; } .welcome-logo { - width: 100px; -} -.welcome-wallet-name { - font-size: $font-size-middle-title; - color: #2c3451; - line-height: 24px; - margin-top: 6px; - margin-bottom: 15px; + width: 334px; + height: 75px; + margin-bottom: 20px; } .welcome-wallet-intro { margin-top: 110px;