diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json index 2bce52cd9f8c..9d9ab0617714 100644 --- a/app/_locales/cs/messages.json +++ b/app/_locales/cs/messages.json @@ -79,7 +79,7 @@ "description": "The description of the application" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "The name of the application" }, "approved": { diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 25ec628f02ac..71dffcb7927d 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -79,7 +79,7 @@ "description": "Die Beschreibung der Erweiterung" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "Der Name der Erweiterung" }, "approved": { diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 35e6a0bef276..f590a9958735 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -87,7 +87,7 @@ "message": "Amount + Gas" }, "appDescription": { - "message": "CyberMiles Browser Extension", + "message": "CyberMiles Blockchain Wallet", "description": "The description of the application" }, "appName": { diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index ae1c9559ffd0..ccb7f8a354af 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -79,7 +79,7 @@ "description": "La descripción de la aplicación" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "El nombre de la aplicación" }, "approved": { diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index e60aa3218166..6dd30b2c733f 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -88,7 +88,7 @@ "description": "La description de l'application" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "Le nom de l'application" }, "approve": { diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json index c94ddc8d2b29..c4675b987b72 100644 --- a/app/_locales/ht/messages.json +++ b/app/_locales/ht/messages.json @@ -91,7 +91,7 @@ "description": "The description of the application" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "The name of the application" }, "approve": { diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index 58b3dfc0533b..b6b433976b73 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -94,7 +94,7 @@ "description": "La descrizione dell'applicazione" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "Il nome dell'applicazione" }, "approve": { diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 93b5447d71c3..1d38a2bedc21 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -79,7 +79,7 @@ "description": "The description of the application" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "The name of the application" }, "attemptingConnect": { diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json index b7b06e0751e3..5ac7d96ac7cb 100644 --- a/app/_locales/nl/messages.json +++ b/app/_locales/nl/messages.json @@ -79,7 +79,7 @@ "description": "De beschrijving van de applicatie" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "De naam van de applicatie" }, "attemptingConnect": { diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json index cef6868682b0..94368f9f89e6 100644 --- a/app/_locales/ph/messages.json +++ b/app/_locales/ph/messages.json @@ -73,7 +73,7 @@ "description": "Ang deskripsyon ng application" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "Ang pangalan ng application" }, "attemptingConnect": { diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json index 7e64ec689b21..bfe527a46f39 100644 --- a/app/_locales/pl/messages.json +++ b/app/_locales/pl/messages.json @@ -46,7 +46,7 @@ "description": "Opis aplikacji" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "Nazwa aplikacji" }, "approve": { diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index 08af4b2a60a5..228fc7192255 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -79,7 +79,7 @@ "description": "A descrição da aplicação" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "Nome da aplicação" }, "attemptingConnect": { diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 9568c64e6aba..651c7168170a 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -79,7 +79,7 @@ "description": "The description of the application" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "The name of the application" }, "approved": { diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json index febcc91415ca..b30a5d075c65 100644 --- a/app/_locales/sk/messages.json +++ b/app/_locales/sk/messages.json @@ -79,7 +79,7 @@ "description": "The description of the application" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "The name of the application" }, "approved": { diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json index 1808dca2752f..60cab9111d9b 100644 --- a/app/_locales/sl/messages.json +++ b/app/_locales/sl/messages.json @@ -91,7 +91,7 @@ "description": "The description of the application" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "The name of the application" }, "approve": { diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json index b80c39b98692..109256251d96 100644 --- a/app/_locales/th/messages.json +++ b/app/_locales/th/messages.json @@ -79,7 +79,7 @@ "description": "The description of the application" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "The name of the application" }, "attemptingConnect": { diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index b085828a2606..f71d4c82bebe 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -79,7 +79,7 @@ "description": "Uygulama açıklaması" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "Uygulama ismi" }, "approved": { diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index f0837ba98fab..4b84699e1d6e 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -74,7 +74,7 @@ }, "appName": { "description": "Tên phần mềm", - "message": "MetaMask" + "message": "Venus" }, "attemptingConnect": { "message": "Đang kết nối đến blockchain." diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 6e2398a6b9f0..103d2655449c 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -78,7 +78,7 @@ "message": "数量 + Gas" }, "appDescription": { - "message": "CMT浏览器插件", + "message": "CyberMiles 区块链钱包", "description": "The description of the application" }, "appName": { diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index 2d82a8acf520..6295114bd025 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -75,11 +75,11 @@ "message": "數額 + Gas" }, "appDescription": { - "message": "乙太坊瀏覽器擴充插件", + "message": "CyberMiles 區塊鏈錢包", "description": "The description of the application" }, "appName": { - "message": "MetaMask", + "message": "Venus", "description": "The name of the application" }, "approved": { diff --git a/app/images/icon-128.png b/app/images/icon-128.png index 6beeead56aa6..1ea85a8b7189 100644 Binary files a/app/images/icon-128.png and b/app/images/icon-128.png differ diff --git a/app/images/icon-16.png b/app/images/icon-16.png index 8dfe4499062c..d464e72877bd 100644 Binary files a/app/images/icon-16.png and b/app/images/icon-16.png differ diff --git a/app/images/icon-19.png b/app/images/icon-19.png index ccc1338167d3..b5df2773c19c 100644 Binary files a/app/images/icon-19.png and b/app/images/icon-19.png differ diff --git a/app/images/icon-32.png b/app/images/icon-32.png index 30867b9794fc..baef9d0826bd 100644 Binary files a/app/images/icon-32.png and b/app/images/icon-32.png differ diff --git a/app/images/icon-38.png b/app/images/icon-38.png index e2a73174abe4..faec523347c1 100644 Binary files a/app/images/icon-38.png and b/app/images/icon-38.png differ diff --git a/app/images/icon-512.png b/app/images/icon-512.png index 8868a6fdc348..4f583e17405e 100644 Binary files a/app/images/icon-512.png and b/app/images/icon-512.png differ diff --git a/app/images/icon-64.png b/app/images/icon-64.png index 581f935f3134..0401020e32cb 100644 Binary files a/app/images/icon-64.png and b/app/images/icon-64.png differ diff --git a/app/images/info-logo.png b/app/images/info-logo.png index 97ecc6f3b647..30402abb406e 100644 Binary files a/app/images/info-logo.png and b/app/images/info-logo.png differ diff --git a/app/images/logo/metamask-fox.svg b/app/images/logo/metamask-fox.svg index f3c24f79e304..e16aa60c115c 100644 --- a/app/images/logo/metamask-fox.svg +++ b/app/images/logo/metamask-fox.svg @@ -1,128 +1,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + Artboard Copy 7副本 + Created with Sketch. + + + + \ No newline at end of file diff --git a/app/images/logo/metamask-logo-horizontal.svg b/app/images/logo/metamask-logo-horizontal.svg index 8e0bdb938064..1d34c7f3352e 100644 --- a/app/images/logo/metamask-logo-horizontal.svg +++ b/app/images/logo/metamask-logo-horizontal.svg @@ -1,62 +1,14 @@ - - - metamask-logo-horizontal-beta + + + Group 4 Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + VENUS + \ No newline at end of file diff --git a/notices/archive/notice_2.md b/notices/archive/notice_2.md index 89c40f07f133..7cd673ca478c 100644 --- a/notices/archive/notice_2.md +++ b/notices/archive/notice_2.md @@ -2,4 +2,4 @@ Venus is beta software. When you log in to Venus, your current account's address is visible to every new site you visit. This can be used to look up your account balances of CMT and other tokens. -For your privacy, for now, please sign out of MetaMask when you're done using a site. \ No newline at end of file +For your privacy, for now, please sign out of Venus when you're done using a site. \ No newline at end of file diff --git a/notices/archive/notice_4.md b/notices/archive/notice_4.md index 3faa68694582..1cd0eff7690d 100644 --- a/notices/archive/notice_4.md +++ b/notices/archive/notice_4.md @@ -1,3 +1,3 @@ Dear Venus Users, -There have been several instances of high-profile legitimate websites such as BTC Manager and Games Workshop that have had their websites temporarily compromised. This involves showing a fake MetaMask window on the page asking for user's seed phrases. MetaMask will never open itself in this way and users are encouraged to report these instances immediately to our support email at [support@cybermiles.io](mailto:support@cybermiles.io). \ No newline at end of file +There have been several instances of high-profile legitimate websites such as BTC Manager and Games Workshop that have had their websites temporarily compromised. This involves showing a fake Venus window on the page asking for user's seed phrases. Venus will never open itself in this way and users are encouraged to report these instances immediately to our support email at [support@cybermiles.io](mailto:support@cybermiles.io). \ No newline at end of file diff --git a/old-ui/app/components/mascot.js b/old-ui/app/components/mascot.js index 973ec2cad4f1..80e68573c64e 100644 --- a/old-ui/app/components/mascot.js +++ b/old-ui/app/components/mascot.js @@ -1,14 +1,15 @@ const inherits = require('util').inherits const Component = require('react').Component const h = require('react-hyperscript') -const metamaskLogo = require('metamask-logo') -const debounce = require('debounce') +// const metamaskLogo = require('metamask-logo') +// const debounce = require('debounce') module.exports = Mascot inherits(Mascot, Component) function Mascot () { Component.call(this) + /* this.logo = metamaskLogo({ followMouse: true, pxNotRatio: true, @@ -18,19 +19,29 @@ function Mascot () { this.refollowMouse = debounce(this.logo.setFollowMouse.bind(this.logo, true), 1000) this.unfollowMouse = this.logo.setFollowMouse.bind(this.logo, false) + */ } Mascot.prototype.render = function () { // this is a bit hacky // the event emitter is on `this.props` // and we dont get that until render - this.handleAnimationEvents() + // this.handleAnimationEvents() return h('#metamask-mascot-container', { style: { zIndex: 0 }, - }) + }, [ + h('img', { + style: { + width: '120px', + height: '120px', + }, + src: 'images/logo/metamask-fox.svg', + }) + ]) } +/* Mascot.prototype.componentDidMount = function () { var targetDivId = 'metamask-mascot-container' var container = document.getElementById(targetDivId) @@ -57,3 +68,4 @@ Mascot.prototype.lookAt = function (target) { this.logo.lookAt(target) this.refollowMouse() } +*/ \ No newline at end of file diff --git a/old-ui/app/info.js b/old-ui/app/info.js index 4f405b599a9e..b52029c7e84b 100644 --- a/old-ui/app/info.js +++ b/old-ui/app/info.js @@ -93,8 +93,8 @@ InfoScreen.prototype.render = function () { h('a.info', { target: '_blank', style: { width: '85vw' }, - href: 'http://remix.cybermiles.io/', - }, 'Remix for CMT'), + href: 'http://europa.cybermiles.io/', + }, 'Europa'), ]), h('div', [ h('a.info', { diff --git a/old-ui/app/unlock.js b/old-ui/app/unlock.js index 7bf4ad29f7bd..fdfdab754e44 100644 --- a/old-ui/app/unlock.js +++ b/old-ui/app/unlock.js @@ -37,14 +37,6 @@ UnlockScreen.prototype.render = function () { animationEventEmitter: this.animationEventEmitter, }), - h('h1', { - style: { - fontSize: '1.4em', - textTransform: 'uppercase', - color: '#7F8082', - }, - }, 'MetaMask'), - h('input.large-input', { type: 'password', id: 'password-box', diff --git a/ui/app/components/mascot.js b/ui/app/components/mascot.js index 3b0d3e31b416..174631075f11 100644 --- a/ui/app/components/mascot.js +++ b/ui/app/components/mascot.js @@ -1,14 +1,15 @@ const inherits = require('util').inherits const Component = require('react').Component const h = require('react-hyperscript') -const metamaskLogo = require('metamask-logo') -const debounce = require('debounce') +// const metamaskLogo = require('metamask-logo') +// const debounce = require('debounce') module.exports = Mascot inherits(Mascot, Component) function Mascot ({width = '200', height = '200'}) { Component.call(this) + /* this.logo = metamaskLogo({ followMouse: true, pxNotRatio: true, @@ -18,19 +19,29 @@ function Mascot ({width = '200', height = '200'}) { this.refollowMouse = debounce(this.logo.setFollowMouse.bind(this.logo, true), 1000) this.unfollowMouse = this.logo.setFollowMouse.bind(this.logo, false) + */ } Mascot.prototype.render = function () { // this is a bit hacky // the event emitter is on `this.props` // and we dont get that until render - this.handleAnimationEvents() + // this.handleAnimationEvents() return h('#metamask-mascot-container', { style: { zIndex: 0 }, - }) + }, [ + h('img', { + style: { + width: '120px', + height: '120px', + }, + src: 'images/logo/metamask-fox.svg', + }) + ]) } +/* Mascot.prototype.componentDidMount = function () { var targetDivId = 'metamask-mascot-container' var container = document.getElementById(targetDivId) @@ -57,3 +68,4 @@ Mascot.prototype.lookAt = function (target) { this.logo.lookAt(target) this.refollowMouse() } +*/ \ No newline at end of file diff --git a/ui/app/components/pages/settings/info-tab/info-tab.component.js b/ui/app/components/pages/settings/info-tab/info-tab.component.js index 6db0ab278a35..081a33a8ac22 100644 --- a/ui/app/components/pages/settings/info-tab/info-tab.component.js +++ b/ui/app/components/pages/settings/info-tab/info-tab.component.js @@ -65,12 +65,12 @@ export default class InfoTab extends PureComponent {
- Remix for CMT + Europa
diff --git a/ui/app/components/pages/settings/info.js b/ui/app/components/pages/settings/info.js index 671c7e2bf9bb..766c648fab71 100644 --- a/ui/app/components/pages/settings/info.js +++ b/ui/app/components/pages/settings/info.js @@ -48,10 +48,10 @@ class Info extends Component { ]), h('div.settings__info-link-item', [ h('a', { - href: 'http://remix.cybermiles.io/', + href: 'http://europa.cybermiles.io/', target: '_blank', }, [ - h('span.settings__info-link', "Remix for CMT"), + h('span.settings__info-link', "Europa"), ]), ]), h('div.settings__info-link-item', [