Merge pull request #62 from poanetwork/develop

NW 4.8.3 release

.circleci/config.yml

@@ -30,15 +30,6 @@ workflows:
             - prep-deps-npm
             - prep-deps-firefox
             - prep-build
-      - test-e2e-beta-chrome:
-          requires:
-            - prep-deps-npm
-            - prep-build
-      - test-e2e-beta-firefox:
-          requires:
-            - prep-deps-npm
-            - prep-deps-firefox
-            - prep-build
       - test-unit:
           requires:
             - prep-deps-npm
@@ -66,8 +57,6 @@ workflows:
             - test-unit
             - test-e2e-chrome
             - test-e2e-firefox
-            - test-e2e-beta-chrome
-            - test-e2e-beta-firefox
             - test-integration-mascara-chrome
             - test-integration-mascara-firefox
             - test-integration-flat-chrome
@@ -76,13 +65,13 @@ workflows:
           requires:
             - prep-deps-npm
             - prep-build
-            - all-tests-pass
+#           - all-tests-pass
       - job-publish-prerelease:
           requires:
             - prep-deps-npm
             - prep-build
             - job-screens
-            - all-tests-pass
+#           - all-tests-pass
       - job-publish-release:
           filters:
             branches:
@@ -92,7 +81,17 @@ workflows:
             - prep-build
             - prep-docs
             - job-screens
-            - all-tests-pass
+#           - all-tests-pass
+      - job-publish-postrelease:
+          filters:
+            branches:
+              only: master
+          requires:
+             - prep-deps-npm
+             - prep-build
+             - prep-docs
+             - job-screens
+#            - all-tests-pass
 
 jobs:
   prep-deps-npm:
@@ -134,7 +133,7 @@ jobs:
           key: dependency-cache-{{ .Revision }}
       - run:
           name: build:dist
-          command: npm run dist
+          command: NODE_ENV='production' npm run dist
       - run:
           name: build:debug
           command: find dist/ -type f -exec md5sum {} \; | sort -k 2
@@ -322,24 +321,37 @@ jobs:
     docker:
       - image: circleci/node:8.11.3-browsers
     steps:
-      - checkout
-      - restore_cache:
-          key: dependency-cache-{{ .Revision }}
-      - restore_cache:
-          key: build-cache-{{ .Revision }}
-      - restore_cache:
-          key: docs-cache-{{ .Revision }}
-      - restore_cache:
-          key: job-screens-{{ .Revision }}
-      - run:
-          name: sentry sourcemaps upload
-          command: npm run sentry:publish
-      - run:
-          name: github gh-pages docs publish
-          command: >
-            git config user.name metamaskbot
-            git config user.email admin@metamask.io
-            gh-pages -d docs/jsdocs
+     - checkout
+     - restore_cache:
+        key: dependency-cache-{{ .Revision }}
+     - restore_cache:
+        key: build-cache-{{ .Revision }}
+     - run:
+         name: build:release
+         command: node ./development/publish-release.js
+
+  job-publish-postrelease:
+      docker:
+        - image: circleci/node:8.11.3-browsers
+      steps:
+        - checkout
+        - restore_cache:
+            key: dependency-cache-{{ .Revision }}
+        - restore_cache:
+            key: build-cache-{{ .Revision }}
+        - restore_cache:
+            key: docs-cache-{{ .Revision }}
+        - restore_cache:
+            key: job-screens-{{ .Revision }}
+        - run:
+            name: sentry sourcemaps upload
+            command: npm run sentry:publish
+        - run:
+            name: github gh-pages docs publish
+            command: >
+              git config user.name metamaskbot
+              git config user.email admin@metamask.io
+              gh-pages -d docs/jsdocs
 
   test-unit:
     docker:

.eslintignore

@@ -6,6 +6,7 @@ docs/**
 
 development/bundle.js
 development/states.js
+development/publish-release.js
 
 app/scripts/lib/extension-instance.js
 app/scripts/chromereload.js
@@ -19,3 +20,4 @@ test/integration/bundle.js
 test/integration/jquery-3.1.0.min.js
 test/integration/helpers.js
 test/integration/lib/first-time.js
+test/integration/lib/send-new-ui.js

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## Current Master
 
+## 4.8.3 Fri Aug 03 2018
+
+- [#59](https://github.com/poanetwork/metamask-extension/pull/59): Update e2e test of Terms of Use page
+- [#58](https://github.com/poanetwork/metamask-extension/pull/58): Update Terms of Use page style
+- [#57](https://github.com/poanetwork/metamask-extension/pull/57): Optimized images for release.
+- [#55](https://github.com/poanetwork/metamask-extension/pull/55): Tests fix.
+- [#52](https://github.com/poanetwork/metamask-extension/pull/52): Nifty Wallet restyling.
+- [#54](https://github.com/poanetwork/metamask-extension/pull/54): Fix explorer url for POA network on confirmed transaction.
+- [#50](https://github.com/poanetwork/metamask-extension/pull/50): Update sentry links.
+- [#45](https://github.com/poanetwork/metamask-extension/pull/45): Automate release publish.
+- [#39](https://github.com/poanetwork/metamask-extension/pull/39): Swap npm Jazzicon dependency to Rockicon with changed palette for identicon
+
+## 4.8.2 Thu Jul 26 2018
+
 - Add new tokens auto detection
 - Remove rejected transactions from transaction history
 - Add Trezor Support

README.md

@@ -1,5 +1,5 @@
 # MetaMask Browser Extension
-[![Build Status](https://circleci.com/gh/MetaMask/metamask-extension.svg?style=shield&circle-token=a1ddcf3cd38e29267f254c9c59d556d513e3a1fd)](https://circleci.com/gh/MetaMask/metamask-extension) [![Coverage Status](https://coveralls.io/repos/github/MetaMask/metamask-extension/badge.svg?branch=master)](https://coveralls.io/github/MetaMask/metamask-extension?branch=master) [![Greenkeeper badge](https://badges.greenkeeper.io/MetaMask/metamask-extension.svg)](https://greenkeeper.io/) [![Stories in Ready](https://badge.waffle.io/MetaMask/metamask-extension.png?label=in%20progress&title=waffle.io)](https://waffle.io/MetaMask/metamask-extension)
+[![Build Status](https://circleci.com/gh/poanetwork/metamask-extension.svg?style=shield)](https://circleci.com/gh/poanetwork/metamask-extension) <!--[![Coverage Status](https://coveralls.io/repos/github/poanetwork/metamask-extension/badge.svg?branch=master)](https://coveralls.io/github/poanetwork/metamask-extension?branch=master) [![Greenkeeper badge](https://badges.greenkeeper.io/poanetwork/metamask-extension.svg)](https://greenkeeper.io/)--> [![Stories in Ready](https://badge.waffle.io/poanetwork/metamask-extension.png?label=in%20progress&title=waffle.io)](https://waffle.io/poanetwork/metamask-extension)
 
 ## Support
 

app/fonts/Nunito/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2014 The Nunito Project Authors (contact@sansoxygen.com)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

app/images/alert-red.svg

@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
-    <title>Artboard Copy</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Artboard-Copy" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Group-48">
-            <circle id="Oval" fill="#D0021B" cx="8" cy="8" r="8"></circle>
-            <rect id="Rectangle-41" fill="#FFFFFF" x="7" y="3" width="2" height="7" rx="1"></rect>
-            <rect id="Rectangle-41" fill="#FFFFFF" x="7" y="11" width="2" height="2" rx="1"></rect>
-        </g>
-    </g>
-</svg>
+<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><circle cx="8" cy="8" fill="#d0021b" r="8"/><g fill="#fff"><rect height="7" rx="1" width="2" x="7" y="3"/><rect height="2" rx="1" width="2" x="7" y="11"/></g></g></svg>

app/images/alert.svg

@@ -1,19 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="29px" height="29px" viewBox="0 0 29 29" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
-    <title>7414FFD8-B28A-4593-9D7E-19E73D687B50</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Action-Screens" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Approve---insufficient-amount" transform="translate(-69.000000, -166.000000)">
-            <g id="Group-7" transform="translate(53.000000, 51.000000)">
-                <g id="Group-34" transform="translate(0.000000, 91.000000)">
-                    <g id="alert" transform="translate(16.000000, 24.000000)">
-                        <circle id="Oval" fill="#605A1C" cx="14.5" cy="14.5" r="14.5"></circle>
-                        <path d="M16,16.8282967 L14,16.8282967 L14,7 L16,7 L16,16.8282967 Z M16,21 L14,21 L14,19 L16,19 L16,21 Z" id="!" fill="#FFFCDB"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="29" viewBox="0 0 29 29" width="29" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><circle cx="14.5" cy="14.5" fill="#605a1c" r="14.5"/><path d="m16 16.8282967h-2v-9.8282967h2zm0 4.1717033h-2v-2h2z" fill="#fffcdb"/></g></svg>

app/images/arrow-left-white.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14">
+    <path fill="#FFF" fill-rule="evenodd" d="M13 8H3.46l4.256 4.256c.366.367.337.99-.066 1.394-.404.403-1.027.432-1.394.066L.284 7.744a.855.855 0 0 1-.21-.378A.992.992 0 0 1 0 7c0-.13.029-.252.074-.366a.855.855 0 0 1 .21-.378L6.256.284c.367-.366.99-.337 1.394.066.403.404.432 1.027.066 1.394L3.46 6H13a1 1 0 0 1 0 2z"/>
+</svg>

app/images/arrow-right-white.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14">
+    <path fill="#FFF" fill-rule="evenodd" d="M13.926 7.366a.855.855 0 0 1-.21.378l-5.972 5.972c-.367.366-.99.337-1.394-.066-.403-.404-.432-1.027-.066-1.394L10.54 8H1a1 1 0 0 1 0-2h9.54L6.284 1.744c-.366-.367-.337-.99.066-1.394.404-.403 1.027-.432 1.394-.066l5.972 5.972c.107.107.17.239.21.378A.992.992 0 0 1 14 7c0 .13-.029.252-.074.366z"/>
+</svg>

app/images/arrow-right.svg

@@ -1,16 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="25px" height="21px" viewBox="0 0 25 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch -->
-    <title>arrow-right</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Confirm-Send-ETH---V3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(-500.000000, -235.000000)">
-        <g id="Group-4" transform="translate(312.000000, 99.000000)" fill="#5B5B5B">
-            <g id="Group-18" transform="translate(109.000000, 119.000000)">
-                <g id="arrow-right" transform="translate(78.000000, 17.000000)">
-                    <path d="M13.2809946,0.467462271 L13.2809946,0.467462271 C12.6477116,1.09191648 12.6477116,2.10286154 13.2809946,2.72571868 L19.1052554,8.46878095 L2.61883998,8.46878095 C1.72479329,8.46878095 0.999190175,9.18426813 0.999190175,10.0658505 L0.999190175,10.0674476 C0.999190175,10.94903 1.72479329,11.6629201 2.61883998,11.6629201 L19.1052554,11.6629201 L13.2809946,17.4075795 C12.6477116,18.0304366 12.6477116,19.0413817 13.2809946,19.6658359 C13.9126581,20.288693 14.9378964,20.288693 15.5711795,19.6658359 L25.3052748,10.0658505 L15.5711795,0.467462271 C14.9378964,-0.155394872 13.9126581,-0.155394872 13.2809946,0.467462271" id="Fill-1"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="21" viewBox="0 0 25 21" width="25" xmlns="http://www.w3.org/2000/svg"><path d="m13.2809946.46746227c-.633283.62445421-.633283 1.63539927 0 2.25825641l5.8242608 5.74306227h-16.48641542c-.89404669 0-1.6196498.71548718-1.6196498 1.59706955v.0015971c0 .8815824.72560311 1.5954725 1.6196498 1.5954725h16.48641542l-5.8242608 5.7446594c-.633283.6228571-.633283 1.6338022 0 2.2582564.6316635.6228571 1.6569018.6228571 2.2901849 0l9.7340953-9.5999854-9.7340953-9.59838823c-.6332831-.62285714-1.6585214-.62285714-2.2901849 0" fill="#5b5b5b" fill-rule="evenodd" transform="translate(-1)"/></svg>

app/images/camera.svg

@@ -1,18 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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"
-	 width="24.088px" height="24px" viewBox="113.789 0 24.088 24" enable-background="new 113.789 0 24.088 24" xml:space="preserve" fill="#F7861C">
-<g>
-	<path d="M134.613,6.85h-3.499l-2.035-2.009c-0.003-0.002-0.004-0.004-0.006-0.006l-0.004-0.003l0,0
-		c-0.306-0.298-0.725-0.482-1.189-0.482h-4.23c-0.491,0-0.93,0.209-1.238,0.539l-0.003-0.005l-1.991,1.966h-3.571
-		c-0.935,0-1.691,0.747-1.691,1.667v10c0,0.92,0.757,1.668,1.691,1.668h17.768c0.934,0,1.691-0.748,1.691-1.668v-10
-		C136.305,7.597,135.547,6.85,134.613,6.85z M135.459,18.518c0,0.459-0.381,0.834-0.846,0.834h-17.768
-		c-0.466,0-0.846-0.374-0.846-0.834v-10c0-0.459,0.38-0.833,0.846-0.833h3.571h0.351l0.248-0.245l1.024-1.011l0.021,0.062
-		l0.971-1.035c0.164-0.175,0.385-0.271,0.618-0.271h4.23c0.223,0,0.435,0.086,0.602,0.247l2.033,2.008l0.247,0.245h0.353h3.499
-		c0.465,0,0.846,0.374,0.846,0.833V18.518L135.459,18.518z"/>
-	<path d="M125.729,9.351c-2.104,0-3.808,1.678-3.808,3.749c0,2.072,1.703,3.752,3.808,3.752c2.104,0,3.808-1.68,3.808-3.752
-		C129.537,11.028,127.833,9.351,125.729,9.351z M125.729,16.018c-1.633,0-2.962-1.31-2.962-2.918s1.329-2.916,2.962-2.916
-		s2.961,1.307,2.961,2.916S127.362,16.018,125.729,16.018z"/>
-</g>
-</svg>
+<svg enable-background="new 113.789 0 24.088 24" fill="#f7861c" height="24" viewBox="113.789 0 24.088 24" width="24.088" xmlns="http://www.w3.org/2000/svg"><path d="m134.613 6.85h-3.499l-2.035-2.009c-.003-.002-.004-.004-.006-.006l-.004-.003c-.306-.298-.725-.482-1.189-.482h-4.23c-.491 0-.93.209-1.238.539l-.003-.005-1.991 1.966h-3.571c-.935 0-1.691.747-1.691 1.667v10c0 .92.757 1.668 1.691 1.668h17.768c.934 0 1.691-.748 1.691-1.668v-10c-.001-.92-.759-1.667-1.693-1.667zm.846 11.668c0 .459-.381.834-.846.834h-17.768c-.466 0-.846-.374-.846-.834v-10c0-.459.38-.833.846-.833h3.571.351l.248-.245 1.024-1.011.021.062.971-1.035c.164-.175.385-.271.618-.271h4.23c.223 0 .435.086.602.247l2.033 2.008.247.245h.353 3.499c.465 0 .846.374.846.833z"/><path d="m125.729 9.351c-2.104 0-3.808 1.678-3.808 3.749 0 2.072 1.703 3.752 3.808 3.752 2.104 0 3.808-1.68 3.808-3.752s-1.704-3.749-3.808-3.749zm0 6.667c-1.633 0-2.962-1.31-2.962-2.918s1.329-2.916 2.962-2.916 2.961 1.307 2.961 2.916-1.328 2.918-2.961 2.918z"/></svg>

app/images/caret-left.svg

@@ -1,18 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="9px" height="15px" viewBox="0 0 9 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
-    <title>8439120D-5704-4273-B416-FEE134322584</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Action-Screens" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Approve---insufficient-amount" transform="translate(-75.000000, -69.000000)" stroke="#3099F2" stroke-width="2">
-            <g id="Group-7" transform="translate(53.000000, 51.000000)">
-                <g id="cancel" transform="translate(24.000000, 14.000000)">
-                    <g id="Group">
-                        <polyline id="Path-8" points="6.1263881 18.0633906 0 11.6306831 6.31493631 5"></polyline>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="15" viewBox="0 0 9 15" width="9" xmlns="http://www.w3.org/2000/svg"><path d="m6.1263881 18.0633906-6.1263881-6.4327075 6.31493631-6.6306831" fill="none" stroke="#3099f2" stroke-width="2" transform="translate(2 -4)"/></svg>

app/images/caret-right.svg

@@ -1,76 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 1000 1000" style="enable-background:new 0 0 1000 1000;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#231F20;}
-	.st1{fill:none;stroke:#000000;stroke-width:35;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	
-		.st2{fill:none;stroke:#000000;stroke-width:35;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:25,61;}
-	.st3{display:none;}
-	.st4{display:inline;}
-	.st5{fill:#EC008C;}
-	.st6{display:inline;fill:#FFF200;}
-</style>
-<g id="Layer_4">
-</g>
-<g id="Layer_1">
-	<g>
-		<g>
-			<g>
-				<g>
-					<g>
-						<g>
-							<g>
-								<g>
-									<g>
-										<g>
-											<g>
-												<g>
-													<g>
-														<g>
-															<g>
-																<g>
-																	<g>
-																		<g>
-																			<g>
-																				<g>
-																					<g>
-																						<g>
-																							<g>
-																								<g>
-																									<g>
-																										<g>
-																											<path class="st0" d="M380.4,756.7c-4.5,0-9-1.7-12.4-5.1c-6.8-6.8-6.8-17.9,0-24.7L594.9,500L368,273.2
-																												c-6.8-6.8-6.8-17.9,0-24.7c6.8-6.8,17.9-6.8,24.7,0L632,487.6c6.8,6.8,6.8,17.9,0,24.7L392.8,751.6
-																												C389.3,755,384.9,756.7,380.4,756.7z"/>
-																										</g>
-																									</g>
-																								</g>
-																							</g>
-																						</g>
-																					</g>
-																				</g>
-																			</g>
-																		</g>
-																	</g>
-																</g>
-															</g>
-														</g>
-													</g>
-												</g>
-											</g>
-										</g>
-									</g>
-								</g>
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</g>
-	</g>
-</g>
-<g id="Layer_2" class="st3">
-</g>
-</svg>
+<svg enable-background="new 0 0 1000 1000" viewBox="0 0 1000 1000" xmlns="http://www.w3.org/2000/svg"><path d="m380.4 756.7c-4.5 0-9-1.7-12.4-5.1-6.8-6.8-6.8-17.9 0-24.7l226.9-226.9-226.9-226.8c-6.8-6.8-6.8-17.9 0-24.7s17.9-6.8 24.7 0l239.3 239.1c6.8 6.8 6.8 17.9 0 24.7l-239.2 239.3c-3.5 3.4-7.9 5.1-12.4 5.1z" fill="#231f20"/></svg>

app/images/check-icon.svg

@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="100px" height="100px" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
-    <title>76BCDB09-52B0-41CB-908F-12F9087A2F1B</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Confirm-TX-screen" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="confirmed-alert" transform="translate(-144.000000, -53.000000)" stroke="#61BA00" stroke-width="4">
-            <g id="Group-17-Copy" transform="translate(22.000000, 20.000000)">
-                <g id="check-icon" transform="translate(124.000000, 35.000000)">
-                    <circle id="Oval-5" cx="48" cy="48" r="48"></circle>
-                    <polyline id="Path-3" stroke-linecap="round" points="29.76 52.8 41.0023819 64.32 71.04 34.56"></polyline>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke="#61ba00" stroke-width="4" transform="translate(2 2)"><circle cx="48" cy="48" r="48"/><path d="m29.76 52.8 11.2423819 11.52 30.0376181-29.76" stroke-linecap="round"/></g></svg>

app/images/check-white.svg

@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="13px" viewBox="0 0 16 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 47 (45396) - http://www.bohemiancoding.com/sketch -->
-    <title>check-white</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="MetaMascara-v2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="account-dropdown-top-bar-IXD" transform="translate(-17.000000, -80.000000)" fill-rule="nonzero" fill="#FFFFFF">
-            <g id="Group-11" transform="translate(18.000000, 74.000000)">
-                <polygon id="check-white" points="4.2 15.5712828 0.714212839 12.0143571 -0.714212839 13.4142143 4.2 18.4287172 14.7142128 7.69992858 13.2857872 6.30007142"></polygon>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="13" viewBox="0 0 16 13" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m4.2 15.5712828-3.48578716-3.5569257-1.42842568 1.3998572 4.91421284 5.0145029 10.5142128-10.72878862-1.4284256-1.39985716z" fill="#fff" transform="translate(1 -6)"/></svg>

app/images/close.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12">
+    <path fill="#6729A8" fill-rule="evenodd" d="M11.687 1.708L7.406 6l4.249 4.26a1.01 1.01 0 0 1 0 1.426 1.004 1.004 0 0 1-1.421 0l-4.25-4.261-4.249 4.261a1.004 1.004 0 0 1-1.421 0 1.01 1.01 0 0 1 0-1.426L4.563 6 .282 1.708a1.01 1.01 0 0 1 0-1.425 1.003 1.003 0 0 1 1.422 0l4.28 4.292L10.265.283a1.003 1.003 0 0 1 1.422 0 1.01 1.01 0 0 1 0 1.425z"/>
+</svg>

app/images/connect-icon.svg

@@ -1,11 +1 @@
-<svg width="288" height="288" xmlns="http://www.w3.org/2000/svg">
-
- <g>
-  <title>background</title>
-  <rect fill="none" id="canvas_background" height="402" width="582" y="-1" x="-1"/>
- </g>
- <g>
-  <title>Layer 1</title>
-  <path fill="#ffffff" id="svg_1" d="m122,25l15,-21c4,-5 10,-5 14,0l16,22c4,5 2,10 -5,10l-12,0l0,118c0,3 3,3 5,1l25,-25c4,-4 6,-10 6,-16l0,-24c-7,0 -12,-5 -12,-12l0,-12c0,-6 5,-12 12,-12l12,0c7,0 12,5 12,12l0,12c0,7 -5,12 -12,12l0,24c0,10 -3,18 -10,25l-31,31c-4,4 -7,6 -7,16l0,49c12,3 21,13 21,26c0,15 -12,27 -27,27s-27,-12 -27,-27c0,-13 9,-23 21,-26l0,-13c0,-10 -3,-13 -7,-17l-31,-31c-6,-6 -10,-14 -10,-24l0,-25c-7,-2 -12,-9 -12,-17c0,-10 8,-18 18,-18s18,8 18,18c0,8 -5,15 -12,17l0,25c0,7 3,12 7,16l25,25c2,2 4,2 4,-1l0,-154l-12,0c-7,0 -9,-5 -4,-11z"/>
- </g>
-</svg>
+<svg height="288" width="288" xmlns="http://www.w3.org/2000/svg"><path d="m-1-1h582v402h-582z" fill="none"/><path d="m122 25 15-21c4-5 10-5 14 0l16 22c4 5 2 10-5 10h-12v118c0 3 3 3 5 1l25-25c4-4 6-10 6-16v-24c-7 0-12-5-12-12v-12c0-6 5-12 12-12h12c7 0 12 5 12 12v12c0 7-5 12-12 12v24c0 10-3 18-10 25l-31 31c-4 4-7 6-7 16v49c12 3 21 13 21 26 0 15-12 27-27 27s-27-12-27-27c0-13 9-23 21-26v-13c0-10-3-13-7-17l-31-31c-6-6-10-14-10-24v-25c-7-2-12-9-12-17 0-10 8-18 18-18s18 8 18 18c0 8-5 15-12 17v25c0 7 3 12 7 16l25 25c2 2 4 2 4-1v-154h-12c-7 0-9-5-4-11z" fill="#fff"/></svg>

app/images/copy-to-clipboard.svg

@@ -1,24 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="17px" viewBox="0 0 18 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 49.3 (51167) - http://www.bohemiancoding.com/sketch -->
-    <title>374E58A5-C29E-4921-83E7-889FA06D6408</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Reveal-Seedphrase" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Seed-phrase-2" transform="translate(-39.000000, -379.000000)">
-            <g id="Group-2">
-                <g id="Group-8" transform="translate(16.000000, 248.000000)">
-                    <g id="Group-6" transform="translate(23.336478, 120.000000)">
-                        <g id="Group-5" transform="translate(0.408805, 11.000000)">
-                            <g id="copy-to-clipboard">
-                                <rect id="Rectangle-18" stroke="#3098DC" stroke-width="2" x="1" y="1" width="12.0220126" height="12"></rect>
-                                <rect id="Rectangle-18-Copy-2" fill="#FFFFFF" x="2.1572327" y="2" width="14.0220126" height="14"></rect>
-                                <rect id="Rectangle-18-Copy" stroke="#3098DC" stroke-width="2" x="4.23584906" y="4" width="12.0220126" height="12"></rect>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="17" viewBox="0 0 18 17" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="m1.745283 1h12.022013v12h-12.022013z" stroke="#3098dc" stroke-width="2"/><path d="m2.902516 2h14.022013v14h-14.022013z" fill="#fff"/><path d="m4.981132 4h12.022013v12h-12.022013z" stroke="#3098dc" stroke-width="2"/></g></svg>

app/images/copy.svg

@@ -1,21 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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"
-	 width="24.088px" height="24px" viewBox="189.192 0 24.088 24" enable-background="new 189.192 0 24.088 24" xml:space="preserve" fill="#F7861C">
-<g>
-	<g>
-		<path fill="#F7861C" d="M204.655,7.169h-8.962c-1.1,0-1.991,0.891-1.991,1.991v8.963c0,1.1,0.892,1.99,1.991,1.99h8.962
-			c1.101,0,1.991-0.891,1.991-1.99V9.16C206.646,8.06,205.756,7.169,204.655,7.169z M205.651,18.123
-			c0,0.549-0.446,0.994-0.996,0.994h-8.962c-0.549,0-0.995-0.445-0.995-0.994V9.16c0-0.55,0.446-0.996,0.995-0.996h8.962
-			c0.55,0,0.996,0.446,0.996,0.996V18.123z"/>
-	</g>
-</g>
-<path fill="#F7861C" d="M196.689,11.152h6.969v-0.996h-6.969V11.152z"/>
-<path fill="#F7861C" d="M196.689,13.144h6.969v-0.996h-6.969V13.144z"/>
-<path fill="#F7861C" d="M196.689,15.135h6.969v-0.996h-6.969V15.135z"/>
-<path fill="#F7861C" d="M196.689,17.126h3.982v-0.994h-3.982V17.126z"/>
-<path fill="#F7861C" d="M207.643,4.182h-8.962c-1.101,0-1.991,0.892-1.991,1.991h0.995c0-0.549,0.446-0.996,0.996-0.996h8.962
-	c0.549,0,0.995,0.447,0.995,0.996v8.962c0,0.55-0.446,0.997-0.995,0.997v0.994c1.101,0,1.991-0.891,1.991-1.991V6.172
-	C209.634,5.073,208.743,4.182,207.643,4.182z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14">
+    <path fill="#6729A8" fill-rule="evenodd" d="M13 10a1 1 0 0 1-1-1V2H5a1 1 0 0 1 0-2h8a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1zm-3-5v8a1 1 0 0 1-1 1H1a1 1 0 0 1-1-1V5a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1zM8 6H2v6h6V6z"/>
 </svg>

app/images/deposit-eth.svg

@@ -1,32 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="80px" height="78px" viewBox="0 0 80 78" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 49 (51002) - http://www.bohemiancoding.com/sketch -->
-    <title>deposit-eth</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <circle id="path-1" cx="34" cy="34" r="34"></circle>
-        <circle id="path-2" cx="17" cy="17" r="17"></circle>
-    </defs>
-    <g id="Buy-ETH" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="deposit-Ether" transform="translate(-79.000000, -146.000000)">
-            <g id="Group-12" transform="translate(8.000000, 10.000000)">
-                <g id="Group-7" transform="translate(71.000000, 122.000000)">
-                    <g id="deposit-eth" transform="translate(0.000000, 14.000000)">
-                        <g id="Oval">
-                            <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
-                            <circle stroke="#38393A" stroke-width="3" cx="34" cy="34" r="32.5"></circle>
-                        </g>
-                        <path d="M34.406509,44.95 L22,37.7 L34.406509,55 L46.8205983,37.7 L34.4039822,44.95 L34.406509,44.95 Z M34.593491,15 L22.186982,35.37 L34.593491,42.6275 L47,35.3775 L34.593491,15 Z" id="Shape" fill="#38393A"></path>
-                        <g id="Group-6" transform="translate(46.000000, 44.000000)">
-                            <g id="Oval-Copy">
-                                <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-2"></use>
-                                <circle stroke="#38393A" stroke-width="3" cx="17" cy="17" r="15.5"></circle>
-                            </g>
-                            <path d="M19.0769231,15.4230769 L25.5,15.4230769 L25.5,19.5769231 L19.0769231,19.5769231 L19.0769231,26 L14.9230769,26 L14.9230769,19.5769231 L8.5,19.5769231 L8.5,15.4230769 L14.9230769,15.4230769 L14.9230769,9 L19.0769231,9 L19.0769231,15.4230769 Z" id="Combined-Shape" fill="#38393A"></path>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="78" viewBox="0 0 80 78" width="80" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><circle cx="34" cy="34" fill="#fff" fill-rule="evenodd" r="34"/><circle cx="34" cy="34" r="32.5" stroke="#38393a" stroke-width="3"/><path d="m34.406509 44.95-12.406509-7.25 12.406509 17.3 12.4140893-17.3-12.4166161 7.25zm.186982-29.95-12.406509 20.37 12.406509 7.2575 12.406509-7.25z" fill="#38393a"/><g transform="translate(46 44)"><circle cx="17" cy="17" fill="#fff" fill-rule="evenodd" r="17"/><circle cx="17" cy="17" r="15.5" stroke="#38393a" stroke-width="3"/><path d="m19.0769231 15.4230769h6.4230769v4.1538462h-6.4230769v6.4230769h-4.1538462v-6.4230769h-6.4230769v-4.1538462h6.4230769v-6.4230769h4.1538462z" fill="#38393a"/></g></g></svg>

app/images/download.svg

@@ -1,26 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="18px" viewBox="0 0 20 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 49.3 (51167) - http://www.bohemiancoding.com/sketch -->
-    <title>50559280-0739-419A-8E87-3CDD16A6996A</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Reveal-Seedphrase" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Seed-phrase-2" transform="translate(-212.000000, -379.000000)" stroke="#259DE5" stroke-width="2">
-            <g id="Group-2">
-                <g id="Group-8" transform="translate(16.000000, 248.000000)">
-                    <g id="Group-6" transform="translate(23.336478, 120.000000)">
-                        <g id="Group-3" transform="translate(174.000000, 11.000000)">
-                            <g id="Group-4">
-                                <g id="download">
-                                    <polyline id="Path-5" points="0 11 0 17 17 17 17 11"></polyline>
-                                    <path d="M8.5,0 L8.5,11" id="Path-6"></path>
-                                    <polyline id="Path-7" points="3.1875 7 8.5 11 13.8125 7"></polyline>
-                                </g>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="18" viewBox="0 0 20 18" width="20" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" stroke="#259de5" stroke-width="2" transform="translate(1.336478)"><path d="m0 11v6h17v-6"/><path d="m8.5 0v11"/><path d="m3.1875 7 5.3125 4 5.3125-4"/></g></svg>

app/images/eth_logo.svg

@@ -1,11 +1 @@
-<?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>
+<svg height="417" preserveAspectRatio="xMidYMid" viewBox="0 0 256 417" width="256" xmlns="http://www.w3.org/2000/svg"><path d="m127.9611 0-2.795 9.5v275.668l2.795 2.79 127.962-75.638z" fill="#343434"/><path d="m127.962 0-127.962 212.32 127.962 75.639v-133.801z" fill="#8c8c8c"/><path d="m127.9611 312.1866-1.575 1.92v98.199l1.575 4.601 128.038-180.32z" fill="#3c3c3b"/><path d="m127.962 416.9052v-104.72l-127.962-75.6z" fill="#8c8c8c"/><path d="m127.9611 287.9577 127.96-75.637-127.96-58.162z" fill="#141414"/><path d="m.0009 212.3208 127.96 75.637v-133.799z" fill="#393939"/></svg>

app/images/forward-carrat-light.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="64">
+    <path fill="#60DB97" fill-rule="evenodd" d="M19.996 32c0 .031 0 .062-.003.093-.003.03-.009.059-.015.089-.007.032-.013.064-.023.095a1.023 1.023 0 0 1-.077.179c-.005.008-.007.017-.012.026l-18 30.061a1.02 1.02 0 0 1-1.366.353.947.947 0 0 1-.366-1.318L17.845 32 .134 2.422A.947.947 0 0 1 .5 1.104a1.02 1.02 0 0 1 1.366.353l18 30.061c.005.009.007.018.012.026a1.023 1.023 0 0 1 .077.179c.01.031.016.063.023.095.006.03.012.059.015.089a.963.963 0 0 1 .003.093z"/>
+</svg>

app/images/forward-carrat.svg

@@ -1,74 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="4.2333331mm"
-   height="12.800793mm"
-   viewBox="0 0 14.999999 45.357139"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="forward-carrat.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="17.87049"
-     inkscape:cy="17.678567"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1276"
-     inkscape:window-height="755"
-     inkscape:window-x="4"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4136"
-       originx="-180"
-       originy="-602.14286" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-180,-404.8622)">
-    <path
-       style="fill:#f7861c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 180,404.8622 0,7.5 10,15 -10,15 0,7.85714 15,-22.85714 z"
-       id="path4138"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
-  </g>
-</svg>
+<svg height="64" width="50" xmlns="http://www.w3.org/2000/svg"><g fill="#60db97" fill-rule="evenodd"><path d="m49.996 32c0 .032 0 .064-.003.095-.003.032-.009.062-.015.093-.007.033-.013.065-.023.098-.008.027-.019.053-.03.08a1.07 1.07 0 0 1 -.047.104l-.012.027-18 31.001a1.004 1.004 0 0 1 -1.366.364.992.992 0 0 1 -.366-1.359l17.711-30.503-17.711-30.503a.992.992 0 0 1 .366-1.359 1.004 1.004 0 0 1 1.366.364l18 31.001.012.027c.018.034.033.069.047.104.011.027.022.053.03.08.01.033.016.065.023.098.006.031.012.061.015.093.003.031.003.063.003.095z"/><path d="m34.996 32c0 .032 0 .064-.003.095-.003.032-.009.062-.015.093-.007.033-.013.065-.023.098-.008.027-.019.053-.03.08a1.07 1.07 0 0 1 -.047.104l-.012.027-18 31.001a1.004 1.004 0 0 1 -1.366.364.992.992 0 0 1 -.366-1.359l17.711-30.503-17.711-30.503a.992.992 0 0 1 .366-1.359 1.004 1.004 0 0 1 1.366.364l18 31.001.012.027c.018.034.033.069.047.104.011.027.022.053.03.08.01.033.016.065.023.098.006.031.012.061.015.093.003.031.003.063.003.095z" opacity=".502"/><path d="m19.996 32c0 .032 0 .064-.003.096-.003.03-.009.061-.015.092-.007.033-.013.065-.023.098-.008.027-.019.053-.03.08a1.07 1.07 0 0 1 -.047.104l-.012.027-18 31.001a1.004 1.004 0 0 1 -1.366.364.992.992 0 0 1 -.366-1.359l17.711-30.503-17.711-30.503a.992.992 0 0 1 .366-1.359 1.004 1.004 0 0 1 1.366.364l18 31.001.012.027c.018.034.033.069.047.104.011.027.022.053.03.08.01.033.016.065.023.098.006.031.012.062.015.092.003.032.003.064.003.096z" opacity=".2"/></g></svg>

app/images/hardware-wallet-step-3.svg

@@ -1,42 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="108px" height="85px" viewBox="0 0 108 85" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
-    <title>CEB55C41-7BCE-405E-83CD-834B388B495F</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Import-account" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="hardware-connect" transform="translate(-457.000000, -1057.000000)">
-            <g id="Group-11" transform="translate(356.000000, 929.000000)">
-                <g id="use-dapps" transform="translate(102.000000, 129.000000)">
-                    <g id="Group-3">
-                        <path d="M96.2021481,83 L9.79785192,83 C7.70080469,83 6,81.2922121 6,79.1851351 L6,8.81486493 C6,6.70778787 7.70080469,5 9.79785192,5 L96.2021481,5 C98.2998283,5 100,6.70778787 100,8.81486493 L100,79.1851351 C100,81.2922121 98.2998283,83 96.2021481,83" id="Fill-12" fill="#FEFEFE"></path>
-                        <path d="M96.2021481,83 L9.79785192,83 C7.70080469,83 6,81.2922121 6,79.1851351 L6,8.81486493 C6,6.70778787 7.70080469,5 9.79785192,5 L96.2021481,5 C98.2998283,5 100,6.70778787 100,8.81486493 L100,79.1851351 C100,81.2922121 98.2998283,83 96.2021481,83 Z" id="Stroke-13" stroke="#3098DC"></path>
-                        <path d="M104.729634,83 L1.27036631,83 C0.568488923,83 0,82.4502457 0,81.7714988 L0,77.2285012 C0,76.5497543 0.568488923,76 1.27036631,76 L104.729634,76 C105.430876,76 106,76.5497543 106,77.2285012 L106,81.7714988 C106,82.4502457 105.430876,83 104.729634,83" id="Fill-14" fill="#D9F0FF"></path>
-                        <path d="M104.729634,83 L1.27036631,83 C0.568488923,83 0,82.4502457 0,81.7714988 L0,77.2285012 C0,76.5497543 0.568488923,76 1.27036631,76 L104.729634,76 C105.430876,76 106,76.5497543 106,77.2285012 L106,81.7714988 C106,82.4502457 105.430876,83 104.729634,83 Z" id="Stroke-15" stroke="#3098DC"></path>
-                        <polygon id="Fill-16" fill="#FEFEFE" points="10 71 96 71 96 10 10 10"></polygon>
-                        <polygon id="Stroke-17" stroke="#3098DC" points="10 71 96 71 96 10 10 10"></polygon>
-                        <rect id="Rectangle-2" stroke="#3098DC" fill="#FFFFFF" x="14.5" y="14.5" width="77" height="53" rx="2"></rect>
-                        <path d="M14.5,21.5 L91.5,21.5 L91.5,16 C91.5,15.1715729 90.8284271,14.5 90,14.5 L16,14.5 C15.1715729,14.5 14.5,15.1715729 14.5,16 L14.5,21.5 Z" id="Rectangle-3" stroke="#3098DC" fill="#FFFFFF"></path>
-                        <g id="Group-6" transform="translate(17.000000, 17.000000)" fill="#D9F0FF" stroke="#3098DC">
-                            <circle id="Oval-2" cx="1" cy="1" r="1"></circle>
-                            <circle id="Oval-2" cx="5.76923077" cy="1" r="1"></circle>
-                            <circle id="Oval-2" cx="10.5384615" cy="1" r="1"></circle>
-                        </g>
-                        <g id="metamask-outline" transform="translate(73.000000, 0.000000)">
-                            <g id="Group-6">
-                                <path d="M19.2986136,29.0578722 L14.6471457,29.0578722 C14.5655903,29.0578722 14.4874097,29.0337432 14.420478,28.988227 L11.6678439,27.1171303 L10.4574498,26.1448399 L3.73953772,27.9594528 C3.53086848,28.0153883 3.31151268,27.8952915 3.250768,27.6912915 L1.30300094,21.1227109 C1.28050291,21.0475819 1.28162782,20.9691625 1.3058132,20.8945819 L3.37506962,14.5683883 L2.1331783,13.137098 C2.0611846,13.0542915 2.02743755,12.9446141 2.04093637,12.8365819 C2.05443519,12.7285496 2.11349252,12.6298399 2.20404709,12.566227 L2.42621515,12.4093883 L1.80583194,11.8538722 C1.71921452,11.7754528 1.67196866,11.665227 1.67590581,11.5506141 C1.68040542,11.4354528 1.73608805,11.3285174 1.82776752,11.2577754 L2.17761191,10.987969 L1.60784927,10.5618722 C1.50942038,10.4883883 1.45036305,10.3704851 1.45148795,10.2487432 C1.45261285,10.1264528 1.51223264,10.0096464 1.61291132,9.9367109 L2.0313747,9.63235606 L1.03696173,4.94693671 C1.02233801,4.88003348 1.02683761,4.80874316 1.04989809,4.74238832 L2.56570295,0.267549611 C2.60001244,0.166646385 2.6748184,0.0832915464 2.77212238,0.0383238044 C2.86942637,-0.00719232461 2.98191652,-0.0121278085 3.08259521,0.024614127 L12.8984862,3.62422703 L21.0472731,3.62422703 L30.8626017,0.024614127 C30.9632804,-0.0126761956 31.076333,-0.00719232461 31.173637,0.0383238044 C31.2715034,0.0838399335 31.3463093,0.167194772 31.3800564,0.267549611 L32.8964237,4.74403348 C32.9183593,4.80764639 32.9228589,4.87783993 32.9087976,4.94583993 L31.9250712,9.63400122 L32.3367852,9.93890445 C32.4369014,10.0129367 32.4942714,10.1264528 32.4948338,10.2492915 C32.4953963,10.3704851 32.4369014,10.4872915 32.339035,10.5613238 L31.7687099,10.987969 L32.1179918,11.2577754 C32.2102337,11.3290657 32.2653539,11.4360012 32.2692911,11.5506141 C32.2737907,11.6657754 32.2265448,11.7760012 32.1399274,11.8533238 L31.5195442,12.4093883 L31.7422747,12.5667754 C31.8322668,12.6298399 31.8913241,12.7285496 31.904823,12.8371303 C31.9183218,12.9451625 31.8840123,13.0548399 31.8120186,13.1376464 L30.5712522,14.5678399 L32.6517576,20.8934851 C32.6765054,20.966969 32.6776303,21.0464851 32.6556948,21.1221625 L30.6944289,27.6918399 C30.6342467,27.8952915 30.4143284,28.0142915 30.2062216,27.9594528 L23.4883095,26.1448399 L22.2413561,27.1434528 L19.5252813,28.988227 C19.4583497,29.0337432 19.3796066,29.0578722 19.2986136,29.0578722 Z" id="Stroke-19" stroke="#3098DC" fill="#FFFFFF"></path>
-                                <polygon id="Fill-20" fill="#3098DC" points="18.0235556 24.6774194 15.6567628 24.6774194 15.2461737 24.9949355 15.0898124 26.9088065 18.590506 26.9088065 18.4335823 24.9949355"></polygon>
-                                <path d="M20.5891522,17.1247473 L19.6104879,19.2239731 C19.5311823,19.3939731 19.6886685,19.5776828 19.8675279,19.5239408 L23.2045484,18.522586 C23.3946567,18.4655537 23.4137801,18.2012312 23.2332334,18.1178763 L20.8748772,17.0200054 C20.7674491,16.9701021 20.6397728,17.016715 20.5891522,17.1247473" id="Fill-21" fill="#3098DC"></path>
-                                <path d="M13.0701367,17.0200164 L10.7151553,18.117339 C10.535171,18.2012422 10.5537319,18.4650164 10.7444027,18.5225971 L14.0808608,19.5239519 C14.2597201,19.5776938 14.4172063,19.3934358 14.3379008,19.2234358 L13.3558617,17.12421 C13.3052411,17.0167261 13.1775648,16.9701132 13.0701367,17.0200164" id="Fill-22" fill="#3098DC"></path>
-                            </g>
-                        </g>
-                    </g>
-                    <text id="LOGIN-WITH-METAMASK" font-family="RobotoMono-Bold, Roboto Mono" font-size="10" font-weight="bold" fill="#3098DC">
-                        <tspan x="24.4951172" y="43">LOGIN WITH </tspan>
-                        <tspan x="30.4960938" y="56">METAMASK</tspan>
-                    </text>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="85" viewBox="0 0 108 85" width="108" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" transform="translate(1 1)"><path d="m96.2021481 83h-86.40429618c-2.09704723 0-3.79785192-1.7077879-3.79785192-3.8148649v-70.37027017c0-2.10707706 1.70080469-3.81486493 3.79785192-3.81486493h86.40429618c2.0976802 0 3.7978519 1.70778787 3.7978519 3.81486493v70.37027017c0 2.107077-1.7001717 3.8148649-3.7978519 3.8148649" fill="#fefefe"/><path d="m96.2021481 83h-86.40429618c-2.09704723 0-3.79785192-1.7077879-3.79785192-3.8148649v-70.37027017c0-2.10707706 1.70080469-3.81486493 3.79785192-3.81486493h86.40429618c2.0976802 0 3.7978519 1.70778787 3.7978519 3.81486493v70.37027017c0 2.107077-1.7001717 3.8148649-3.7978519 3.8148649z" stroke="#3098dc"/><path d="m104.729634 83h-103.45926769c-.70187739 0-1.27036631-.5497543-1.27036631-1.2285012v-4.5429976c0-.6787469.56848892-1.2285012 1.27036631-1.2285012h103.45926769c.701242 0 1.270366.5497543 1.270366 1.2285012v4.5429976c0 .6787469-.569124 1.2285012-1.270366 1.2285012" fill="#d9f0ff"/><path d="m104.729634 83h-103.45926769c-.70187739 0-1.27036631-.5497543-1.27036631-1.2285012v-4.5429976c0-.6787469.56848892-1.2285012 1.27036631-1.2285012h103.45926769c.701242 0 1.270366.5497543 1.270366 1.2285012v4.5429976c0 .6787469-.569124 1.2285012-1.270366 1.2285012z" stroke="#3098dc"/><path d="m10 71h86v-61h-86z" fill="#fefefe"/><g stroke="#3098dc"><path d="m10 71h86v-61h-86z"/><rect fill="#fff" height="53" rx="2" width="77" x="14.5" y="14.5"/><path d="m14.5 21.5h77v-5.5c0-.8284271-.6715729-1.5-1.5-1.5h-74c-.8284271 0-1.5.6715729-1.5 1.5z" fill="#fff"/><g fill="#d9f0ff"><circle cx="18" cy="18" r="1"/><circle cx="22.769231" cy="18" r="1"/><circle cx="27.538462" cy="18" r="1"/></g></g><g transform="translate(73)"><path d="m19.2986136 29.0578722h-4.6514679c-.0815554 0-.159736-.024129-.2266677-.0696452l-2.7526341-1.8710967-1.2103941-.9722904-6.71791208 1.8146129c-.20866924.0559355-.42802504-.0641613-.48876972-.2681613l-1.94776706-6.5685806c-.02249803-.075129-.02137312-.1535484.00281226-.228129l2.06925642-6.3261936-1.24189132-1.4312903c-.0719937-.0828065-.10574075-.1924839-.09224193-.3005161.01349882-.1080323.07255615-.206742.16311072-.2703549l.22216806-.1568387-.62038321-.5555161c-.08661742-.0784194-.13386328-.1886452-.12992613-.3032581.00449961-.1151613.06018224-.2220967.15186171-.2928387l.34984439-.2698064-.56976264-.4260968c-.09842889-.0734839-.15748622-.1913871-.15636132-.313129.0011249-.1222904.06074469-.2390968.16142337-.3120323l.41846338-.30435484-.99441297-4.68541935c-.01462372-.06690323-.01012412-.13819355.01293636-.20454839l1.51580486-4.47483871c.03430949-.10090322.10911545-.18425806.20641943-.22922581.09730399-.04551612.20979414-.05045161.31047283-.01370967l9.81589099 3.5996129h8.1487869l9.8153286-3.5996129c.1006787-.03729033.2137313-.03180645.3110353.01370967.0978664.04551613.1726723.12887097.2064194.22922581l1.5163673 4.47648387c.0219356.06361291.0264352.13380645.0123739.20180645l-.9837264 4.68816129.411714.30490323c.1001162.07403225.1574862.18754835.1580486.31038705.0005625.1211936-.0579324.238-.1557988.3120323l-.5703251.4266452.3492819.2698064c.0922419.0712903.1473621.1782258.1512993.2928387.0044996.1151613-.0427463.2253871-.1293637.3027097l-.6203832.5560645.2227305.1573871c.0899921.0630645.1490494.1617742.1625483.2703549.0134988.1080322-.0208107.2177096-.0928044.3005161l-1.2407664 1.4301935 2.0805054 6.3256452c.0247478.0734839.0258727.153.0039372.2286774l-1.9612659 6.5696774c-.0601822.2034516-.2801005.3224516-.4882073.2676129l-6.7179121-1.8146129-1.2469534.9986129-2.7160748 1.8447742c-.0669316.0455162-.1456747.0696452-.2266677.0696452z" fill="#fff" stroke="#3098dc"/><g fill="#3098dc"><path d="m18.0235556 24.6774194h-2.3667928l-.4105891.3175161-.1563613 1.913871h3.5006936l-.1569237-1.913871z"/><path d="m20.5891522 17.1247473-.9786643 2.0992258c-.0793056.17.0781806.3537097.25704.2999677l3.3370205-1.0013548c.1901083-.0570323.2092317-.3213548.028685-.4047097l-2.3583562-1.0978709c-.1074281-.0499033-.2351044-.0032904-.285725.1047419"/><path d="m13.0701367 17.0200164-2.3549814 1.0973226c-.1799843.0839032-.1614234.3476774.0292474.4052581l3.3364581 1.0013548c.1788593.0537419.3363455-.1305161.25704-.3005161l-.9820391-2.0992258c-.0506206-.1074839-.1782969-.1540968-.285725-.1041936"/></g></g><text fill="#3098dc" font-family="RobotoMono-Bold, Roboto Mono" font-size="10" font-weight="bold"><tspan x="24.495117" y="43">LOGIN WITH</tspan><tspan x="30.496094" y="56">METAMASK</tspan></text></g></svg>

app/images/help.svg

@@ -1,16 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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"
-	 width="24.088px" height="24px" viewBox="51.64 0 24.088 24" enable-background="new 51.64 0 24.088 24" xml:space="preserve">
-<g>
-	<path d="M67.495,2.012c-1.519-1.154-3.229-1.551-5.399-1.551c-1.646,0-3.053,0.337-4.168,1.087
-		c-1.646,1.121-2.419,3.003-2.419,5.979h4.241c0-0.794-0.078-1.65,0.385-2.384c0.465-0.734,1.11-1.297,2.22-1.297
-		c1.126,0,1.707,0.325,2.254,0.999c0.464,0.574,0.641,1.258,0.641,1.987c0,0.63-0.321,1.209-0.701,1.734
-		c-0.211,0.309-0.486,0.584-0.834,0.85c0,0-2.293,1.364-3.098,2.656c-0.602,0.961-0.817,2.166-0.866,3.606
-		c-0.006,0.105,0.031,0.32,0.396,0.32c0.36,0,3.092,0,3.412,0s0.388-0.243,0.393-0.342c0.021-0.526,0.089-1.331,0.183-1.635
-		c0.182-0.575,0.534-1.076,1.087-1.507l1.144-0.791c1.032-0.807,1.854-1.463,2.22-1.982c0.623-0.851,1.06-1.899,1.06-3.142
-		C69.644,4.575,68.897,3.078,67.495,2.012z M61.804,18.195c-1.431-0.044-2.613,0.95-2.661,2.501
-		c-0.046,1.557,1.075,2.578,2.512,2.623c1.489,0.044,2.645-0.916,2.688-2.468C64.388,19.299,63.294,18.239,61.804,18.195z"/>
-</g>
-</svg>
+<svg enable-background="new 51.64 0 24.088 24" height="24" viewBox="51.64 0 24.088 24" width="24.088" xmlns="http://www.w3.org/2000/svg"><path d="m67.495 2.012c-1.519-1.154-3.229-1.551-5.399-1.551-1.646 0-3.053.337-4.168 1.087-1.646 1.121-2.419 3.003-2.419 5.979h4.241c0-.794-.078-1.65.385-2.384.465-.734 1.11-1.297 2.22-1.297 1.126 0 1.707.325 2.254.999.464.574.641 1.258.641 1.987 0 .63-.321 1.209-.701 1.734-.211.309-.486.584-.834.85 0 0-2.293 1.364-3.098 2.656-.602.961-.817 2.166-.866 3.606-.006.105.031.32.396.32h3.412s.388-.243.393-.342c.021-.526.089-1.331.183-1.635.182-.575.534-1.076 1.087-1.507l1.144-.791c1.032-.807 1.854-1.463 2.22-1.982.623-.851 1.06-1.899 1.06-3.142-.002-2.024-.749-3.521-2.151-4.587zm-5.691 16.183c-1.431-.044-2.613.95-2.661 2.501-.046 1.557 1.075 2.578 2.512 2.623 1.489.044 2.645-.916 2.688-2.468.045-1.552-1.049-2.612-2.539-2.656z"/></svg>

app/images/icon-back.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14">
+    <path fill="#6729A8" fill-rule="evenodd" d="M13 8H3.46l4.256 4.256c.366.367.337.99-.066 1.394-.404.403-1.027.432-1.394.066L.284 7.744a.852.852 0 0 1-.21-.377A.997.997 0 0 1 0 7c0-.13.029-.253.074-.366a.855.855 0 0 1 .21-.378L6.256.284c.367-.366.99-.337 1.394.066.403.404.432 1.027.066 1.394L3.46 6H13a1 1 0 0 1 0 2z"/>
+</svg>

app/images/import-account.svg

@@ -1,18 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 47 (45396) - http://www.bohemiancoding.com/sketch -->
-    <title>import-account</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="MetaMascara-v2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="account-dropdown-top-bar-IXD" transform="translate(-25.000000, -718.000000)">
-            <g id="Group-6" transform="translate(4.000000, 646.000000)">
-                <g id="import-account" transform="translate(21.000000, 72.000000)">
-                    <rect id="Rectangle-49" fill="#FFFFFF" x="0" y="13.1721326" width="14.4893459" height="1.08397642"></rect>
-                    <rect id="Rectangle" fill="#FFFFFF" x="6.5860663" y="0" width="1.08397642" height="10.5377061"></rect>
-                    <polyline id="Path-12" stroke="#FFFFFF" points="2.63442652 6.5860663 7.24467293 10.5377061 11.8549193 6.5860663"></polyline>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="m0 13.172133h14.489346v1.083976h-14.489346z" fill="#fff"/><path d="m6.586066 0h1.083976v10.537706h-1.083976z" fill="#fff"/><path d="m2.63442652 6.5860663 4.61024641 3.9516398 4.61024637-3.9516398" stroke="#fff"/></g></svg>

app/images/invalid-name.svg

@@ -0,0 +1 @@
+<svg height="18" width="2" xmlns="http://www.w3.org/2000/svg"><path d="m1 13a1 1 0 0 1 -1-1v-11a1 1 0 0 1 2 0v11a1 1 0 0 1 -1 1zm0 3a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" fill="#60db97" fill-rule="evenodd"/></svg>

app/images/loading.svg

@@ -1 +1,49 @@
-<svg width='120px' height='120px' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" class="uil-default"><rect x="0" y="0" width="100" height="100" fill="none" class="bk"></rect><rect  x='46' y='39' width='8' height='22' rx='5' ry='5' fill='#ffae29' transform='rotate(0 50 50) translate(0 -20)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0s' repeatCount='indefinite'/></rect><rect  x='46' y='39' width='8' height='22' rx='5' ry='5' fill='#ffae29' transform='rotate(40 50 50) translate(0 -20)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.1111111111111111s' repeatCount='indefinite'/></rect><rect  x='46' y='39' width='8' height='22' rx='5' ry='5' fill='#ffae29' transform='rotate(80 50 50) translate(0 -20)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.2222222222222222s' repeatCount='indefinite'/></rect><rect  x='46' y='39' width='8' height='22' rx='5' ry='5' fill='#ffae29' transform='rotate(120 50 50) translate(0 -20)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.3333333333333333s' repeatCount='indefinite'/></rect><rect  x='46' y='39' width='8' height='22' rx='5' ry='5' fill='#ffae29' transform='rotate(160 50 50) translate(0 -20)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.4444444444444444s' repeatCount='indefinite'/></rect><rect  x='46' y='39' width='8' height='22' rx='5' ry='5' fill='#ffae29' transform='rotate(200 50 50) translate(0 -20)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.5555555555555556s' repeatCount='indefinite'/></rect><rect  x='46' y='39' width='8' height='22' rx='5' ry='5' fill='#ffae29' transform='rotate(240 50 50) translate(0 -20)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.6666666666666666s' repeatCount='indefinite'/></rect><rect  x='46' y='39' width='8' height='22' rx='5' ry='5' fill='#ffae29' transform='rotate(280 50 50) translate(0 -20)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.7777777777777778s' repeatCount='indefinite'/></rect><rect  x='46' y='39' width='8' height='22' rx='5' ry='5' fill='#ffae29' transform='rotate(320 50 50) translate(0 -20)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.8888888888888888s' repeatCount='indefinite'/></rect></svg>
+<svg class="lds-spinner" width="200px"  height="200px"  xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" style="background: none;"><g transform="rotate(0 50 50)">
+  <rect x="47" y="22.5" rx="4.7" ry="2.25" width="6" height="15" fill="#6729a8">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.9166666666666666s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(30 50 50)">
+  <rect x="47" y="22.5" rx="4.7" ry="2.25" width="6" height="15" fill="#6729a8">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.8333333333333334s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(60 50 50)">
+  <rect x="47" y="22.5" rx="4.7" ry="2.25" width="6" height="15" fill="#6729a8">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.75s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(90 50 50)">
+  <rect x="47" y="22.5" rx="4.7" ry="2.25" width="6" height="15" fill="#6729a8">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.6666666666666666s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(120 50 50)">
+  <rect x="47" y="22.5" rx="4.7" ry="2.25" width="6" height="15" fill="#6729a8">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.5833333333333334s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(150 50 50)">
+  <rect x="47" y="22.5" rx="4.7" ry="2.25" width="6" height="15" fill="#6729a8">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.5s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(180 50 50)">
+  <rect x="47" y="22.5" rx="4.7" ry="2.25" width="6" height="15" fill="#6729a8">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.4166666666666667s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(210 50 50)">
+  <rect x="47" y="22.5" rx="4.7" ry="2.25" width="6" height="15" fill="#6729a8">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.3333333333333333s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(240 50 50)">
+  <rect x="47" y="22.5" rx="4.7" ry="2.25" width="6" height="15" fill="#6729a8">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.25s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(270 50 50)">
+  <rect x="47" y="22.5" rx="4.7" ry="2.25" width="6" height="15" fill="#6729a8">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.16666666666666666s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(300 50 50)">
+  <rect x="47" y="22.5" rx="4.7" ry="2.25" width="6" height="15" fill="#6729a8">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.08333333333333333s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(330 50 50)">
+  <rect x="47" y="22.5" rx="4.7" ry="2.25" width="6" height="15" fill="#6729a8">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="0s" repeatCount="indefinite"></animate>
+  </rect>
+</g></svg>

app/images/lock.svg

@@ -1,9 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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"
-	 width="24.088px" height="24px" viewBox="27.191 0 24.088 24" enable-background="new 27.191 0 24.088 24" xml:space="preserve">
-<path d="M47.576,24H31.588c-1.104,0-1.998-0.896-1.998-2.002V11.993c0-1.105,0.896-2.002,1.998-2.002h1V6.99
-	c0-3.868,3.131-7.004,6.994-7.004s6.995,3.136,6.995,7.004v3.001h0.999c1.104,0,1.998,0.896,1.998,2.002v10.005
-	C49.574,23.102,48.68,24,47.576,24z M43.579,6.99c0-2.21-1.79-4.002-3.997-4.002S35.585,4.78,35.585,6.99v3.001h7.994V6.99z"/>
-</svg>
+<svg enable-background="new 27.191 0 24.088 24" height="24" viewBox="27.191 0 24.088 24" width="24.088" xmlns="http://www.w3.org/2000/svg"><path d="m47.576 24h-15.988c-1.104 0-1.998-.896-1.998-2.002v-10.005c0-1.105.896-2.002 1.998-2.002h1v-3.001c0-3.868 3.131-7.004 6.994-7.004s6.995 3.136 6.995 7.004v3.001h.999c1.104 0 1.998.896 1.998 2.002v10.005c0 1.104-.894 2.002-1.998 2.002zm-3.997-17.01c0-2.21-1.79-4.002-3.997-4.002s-3.997 1.792-3.997 4.002v3.001h7.994z"/></svg>

app/images/logo.svg

@@ -0,0 +1 @@
+<svg height="20" width="22" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><image height="20" width="22" xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAUCAYAAACJfM0wAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAAAEBklEQVQ4y2WVy4tcVRDGf3XOvbd7pmc6k8QHZhKNJgYEMfg2KslCTdwYUHcqIQpKVq78IwT/gKwkCm5dKQgzIrjz/cIEDQRcBEMmM5PJPLpv9z2nPhd9JwlYm+IU1He+qvNVHTv2wPsUVlGEDqH1BR1CKIkUmBWnDT4Elsc+eG2us/fizu4BGh/gcgyjCBXZM1kNhsCMAoEASZgZCGQCQHBGSmcNMAt3J69/zO5vI15FCHhPUi2BwXYOSBQ3I4BowSexd5x8lvbmcd6iU8z2Z8u7Pk8+wuUAj4KeNKMWYNhNgsGw27FBYNhp9+bj7COkxDBfJ1rJ3VOPEMMUyWuE42oeFvrFCB/QMrW2+iBNajIzjIDQqZTH55KPcBJbzSoxdNjTe5wiVIx9EwWRNcbldOPsQ2bxI4mvMQu0WOEW3QDoVFb6NGsCOmhWiFawt/cERegwyutgkHKNKzNb3UURppAywAvIztG+U2hLR/I3kjefJh+SldhqrhFDyb7ZIxShS51vIETjNYpifu0wc8v7yKFGiGABV/N6k4dh7FsUNhHIm1nNZyAMo84rVGGGe2efowhT1GkNzJBnzMUuHuTyC98xThvc89tTUI0Y5FXGeaNnZj8KHSmEXnGNP8MFFhj5OlXosb9/lMqmqdPqpE0CkajyDN3xDvrvLiKH8q2jDHor1LaKUQA8hvGlPb//jCbKCNR+gzL0ODT3Mt04xyjfaHUJGBgie+LOcIhwuCCpJv06Zs0uE0NBILYyNIrk9XrjdT/5kOlyNwd3vEgVZxikFYIZLkeaaNksgIml+De7v7mfTGL1jn+IHpGcjNPq7asiWvVSt9z5PYg9vcfpFH0GzQpmgSYnMOiXe0g+ZDMtU1iFGnF17gLIKHIH2aRNAHJ+MLOTRQjVD7unDhyfq+5bEGJzfI0YItlrBPTLeao4QxmnyEoM0xohBIKVYCDL24AQ7DvDnjWigsnYbK4uLg3/PD72dSAzSptkNfSreTqhT1KNy+lX85SxS/Ia94SUcGWyJ5z0kzw/v70uAkCwgmFaXxzn4YkyTFOFGfrVPrqxT9IIZESr2EpLjPIGYDjegjqu9LPQ02YT+lILDEYRSjAtuPz4ru5BZso7abzGMMo4xVazxEp9iawGJKREVkYa/wF6xsBvXzkBA7PtQ6ROa4vLw79OJI3oxD5V7LHRXGG5vtgWaTgZV8aVf8d4AixtM215TkZaaoUKFKFDna8vLA0unNho/mWlvsTK8BJmgWAR8AlTy+cNHRE0tIBm23q/2YrbzKCK04zz5sLS8PzJtdE/7fiEm30F/wPXUwSG2zlSy1i3Vtr/zOXEUFLQ/SJadQzTt06+7kpXwD9BehJsIE1WJFjrb/0i/wGwOlXnXcFBjwAAAABJRU5ErkJggg=="/></svg>

app/images/menu.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="12">
+    <path fill="#6729A8" fill-rule="evenodd" d="M13 7H1a1 1 0 0 1 0-2h12a1 1 0 0 1 0 2zm0-5H1a1 1 0 0 1 0-2h12a1 1 0 0 1 0 2zM1 10h12a1 1 0 0 1 0 2H1a1 1 0 0 1 0-2z"/>
+</svg>

app/images/mm-bolt.svg

@@ -1,11 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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 252 251.7" style="enable-background:new 0 0 252 251.7;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#757575;}
-</style>
-<path class="st0" d="M211.3,103.9h-60.7c-2,0-3.6-1.6-3.6-3.6V3.6c0-3.5-4.5-5-6.6-2.2l-102.7,140c-1.8,2.4,0,5.8,2.9,5.8h60.7
-	c2,0,3.6,1.6,3.6,3.6v96.6c0,3.5,4.5,5,6.6,2.2l102.7-140C216,107.3,214.3,103.9,211.3,103.9z"/>
-</svg>
+<svg enable-background="new 0 0 252 251.7" viewBox="0 0 252 251.7" xmlns="http://www.w3.org/2000/svg"><path d="m211.3 103.9h-60.7c-2 0-3.6-1.6-3.6-3.6v-96.7c0-3.5-4.5-5-6.6-2.2l-102.7 140c-1.8 2.4 0 5.8 2.9 5.8h60.7c2 0 3.6 1.6 3.6 3.6v96.6c0 3.5 4.5 5 6.6 2.2l102.7-140c1.8-2.3.1-5.7-2.9-5.7z" fill="#757575"/></svg>

app/images/mm-info-icon.svg

@@ -1,11 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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 10 10" style="enable-background:new 0 0 10 10;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#B8B8B8;}
-</style>
-<path class="st0" d="M5,0C2.2,0,0,2.2,0,5s2.2,5,5,5s5-2.2,5-5S7.8,0,5,0z M5,2c0.4,0,0.7,0.3,0.7,0.7c0,0.4-0.3,0.7-0.7,0.7
-	S4.3,3.2,4.3,2.8C4.3,2.4,4.6,2,5,2z M5.7,8H4.3V4.3h1.5V8z"/>
-</svg>
+<svg enable-background="new 0 0 10 10" viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg"><path d="m5 0c-2.8 0-5 2.2-5 5s2.2 5 5 5 5-2.2 5-5-2.2-5-5-5zm0 2c.4 0 .7.3.7.7s-.3.7-.7.7-.7-.2-.7-.6.3-.8.7-.8zm.7 6h-1.4v-3.7h1.5v3.7z" fill="#b8b8b8"/></svg>

app/images/more.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="4" height="24">
+    <path fill="#60DB97" fill-rule="evenodd" d="M2 14a2 2 0 1 1-.001-3.999A2 2 0 0 1 2 14zM2 4A2 2 0 1 1 1.999.001 2 2 0 0 1 2 4zm0 16a2 2 0 1 1 .001 3.999A2 2 0 0 1 2 20z"/>
+</svg>

app/images/open.svg

@@ -1,15 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
-    <title>open</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Mobile-screens" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="MetaMascara-Mobile---structured" transform="translate(-329.000000, -93.000000)">
-            <g id="open" transform="translate(330.000000, 94.000000)">
-                <path d="M26,13 C26,20.1799 20.1799,26 13,26 C5.8201,26 0,20.1799 0,13 C0,5.8201 5.8201,0 13,0 C20.1799,0 26,5.8201 26,13 Z" id="Stroke-3" stroke="#4A4A4A"></path>
-                <path d="M6,17 C6,17 7.78735344,10.8360387 13.7616996,10.8360387 L13.7616996,8 L19,12.3733433 L13.7616996,17 L13.7616996,14.1639613 C13.7616996,14.1639613 9.54083576,13.4629933 6,17" id="Fill-5" fill="#4A4A4A"></path>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="28" viewBox="0 0 28 28" width="28" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" transform="translate(1 1)"><path d="m26 13c0 7.1799-5.8201 13-13 13s-13-5.8201-13-13 5.8201-13 13-13 13 5.8201 13 13z" stroke="#4a4a4a"/><path d="m6 17s1.78735344-6.1639613 7.7616996-6.1639613v-2.8360387l5.2383004 4.3733433-5.2383004 4.6266567v-2.8360387s-4.22086384-.700968-7.7616996 2.8360387" fill="#4a4a4a"/></g></svg>

app/images/plus-btn-white.svg

@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 47 (45396) - http://www.bohemiancoding.com/sketch -->
-    <title>plus-btn-white</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="MetaMascara-v2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="account-dropdown-top-bar-IXD" transform="translate(-24.000000, -669.000000)" fill="#FFFFFF">
-            <g id="Group-6" transform="translate(4.000000, 646.000000)">
-                <g id="plus-btn-white" transform="translate(20.000000, 23.000000)">
-                    <rect id="Rectangle-48" x="7.38461538" y="0" width="1.23076923" height="16"></rect>
-                    <rect id="Rectangle-48" transform="translate(8.000000, 8.000000) rotate(-90.000000) translate(-8.000000, -8.000000) " x="7.38461538" y="0" width="1.23076923" height="16"></rect>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" fill-rule="evenodd"><path d="m7.384615 0h1.230769v16h-1.230769z"/><path d="m7.384615 0h1.230769v16h-1.230769z" transform="matrix(0 -1 1 0 0 16)"/></g></svg>

app/images/popout.svg

@@ -1,21 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch -->
-    <title>popout</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <polygon id="path-1" points="-0.00035 0 10.9999 0 10.9999 10.9997 -0.00035 10.9997"></polygon>
-    </defs>
-    <g id="MetaMascara-Mobile---structured-TOKEN" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(-327.000000, -96.000000)">
-        <g id="popout" transform="translate(327.000000, 96.000000)">
-            <g id="Group-3" transform="translate(11.000000, 0.000000)">
-                <mask id="mask-2" fill="white">
-                    <use xlink:href="#path-1"></use>
-                </mask>
-                <g id="Clip-2"></g>
-                <path d="M10.9229,0.6177 C10.8209,0.3737 10.6269,0.1787 10.3819,0.0767 C10.2599,0.0267 10.1309,-0.0003 9.9999,-0.0003 L3.9999,-0.0003 C3.4479,-0.0003 2.9999,0.4477 2.9999,0.9997 C2.9999,1.5527 3.4479,1.9997 3.9999,1.9997 L7.5859,1.9997 L0.2929,9.2927 C-0.0981,9.6837 -0.0981,10.3167 0.2929,10.7067 C0.4879,10.9027 0.7439,10.9997 0.9999,10.9997 C1.2559,10.9997 1.5119,10.9027 1.7069,10.7067 L8.9999,3.4137 L8.9999,6.9997 C8.9999,7.5527 9.4479,7.9997 9.9999,7.9997 C10.5519,7.9997 10.9999,7.5527 10.9999,6.9997 L10.9999,0.9997 C10.9999,0.8697 10.9739,0.7407 10.9229,0.6177" id="Fill-1" fill="#4A4A4A" mask="url(#mask-2)"></path>
-            </g>
-            <path d="M19,10 C18.448,10 18,10.448 18,11 L18,19 C18,19.551 17.551,20 17,20 L3,20 C2.449,20 2,19.551 2,19 L2,5 C2,4.449 2.449,4 3,4 L11,4 C11.552,4 12,3.552 12,3 C12,2.448 11.552,2 11,2 L3,2 C1.346,2 0,3.346 0,5 L0,19 C0,20.654 1.346,22 3,22 L17,22 C18.654,22 20,20.654 20,19 L20,11 C20,10.448 19.552,10 19,10" id="Fill-4" fill="#4A4A4A"></path>
-        </g>
-    </g>
-</svg>
+<svg height="22" viewBox="0 0 22 22" width="22" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><mask id="a" fill="#fff"><path d="m-.00035 0h11.00025v10.9997h-11.00025z" fill="none"/></mask><g fill="#4a4a4a" fill-rule="evenodd"><path d="m10.9229.6177c-.102-.244-.296-.439-.541-.541-.122-.05-.251-.077-.382-.077h-6c-.552 0-1 .448-1 1 0 .553.448 1 1 1h3.586l-7.293 7.293c-.391.391-.391 1.024 0 1.414.195.196.451.293.707.293s.512-.097.707-.293l7.293-7.293v3.586c0 .553.448 1 1 1s1-.447 1-1v-6c0-.13-.026-.259-.077-.382" mask="url(#a)" transform="translate(11)"/><path d="m19 10c-.552 0-1 .448-1 1v8c0 .551-.449 1-1 1h-14c-.551 0-1-.449-1-1v-14c0-.551.449-1 1-1h8c.552 0 1-.448 1-1s-.448-1-1-1h-8c-1.654 0-3 1.346-3 3v14c0 1.654 1.346 3 3 3h14c1.654 0 3-1.346 3-3v-8c0-.552-.448-1-1-1"/></g></svg>

app/images/qr.svg

@@ -1,29 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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"
-	 width="24.088px" height="24px" viewBox="162.458 0 24.088 24" enable-background="new 162.458 0 24.088 24" xml:space="preserve">
-<g>
-	<rect x="168.545" y="6.167" fill="#1D1D1B" width="2" height="2"/>
-	<path fill="#1D1D1B" d="M167.545,5.167h4.001v4.001h-4.001V5.167z M166.545,10.167h6v-6h-6V10.167z"/>
-	<rect x="178.545" y="6.167" fill="#1D1D1B" width="2" height="2"/>
-	<path fill="#1D1D1B" d="M176.545,10.167h6v-6h-6V10.167z M181.545,9.167h-4v-4h4V9.167z"/>
-	<rect x="168.545" y="16.167" fill="#1D1D1B" width="2" height="2"/>
-	<path fill="#1D1D1B" d="M167.546,15.167h4.001v4.001h-4.001V15.167z M166.546,20.167h5.999v-6h-5.999V20.167z"/>
-	<polygon fill="#1D1D1B" points="173.545,15.167 173.545,16.167 174.546,16.167 174.546,18.167 175.546,18.167 175.546,14.167 
-		174.546,14.167 174.546,15.167 	"/>
-	<path fill="#1D1D1B" d="M177.545,16.167h1v1h-1V16.167z M179.544,15.166h1.002v2.002h-1.002V15.166z M174.545,9.167v1h-1v1h1v2h2v5
-		h1v1h-1v1h2v-1h0.999v-1h1.001v1h-0.875v1h2.875v-2h-1v-2h1v-1.001h-1v-1.999h-1v0.999h-1.001v1h-1.999v-1.999h1v0.999h0.999
-		v-0.999h1.001v-1h-1.001v-1h-0.999v1h-1v-1h-2v-2H174.545z"/>
-	<polygon fill="#1D1D1B" points="175.545,7.167 175.545,4.167 173.545,4.167 173.545,5.167 174.545,5.167 174.545,6.167 
-		173.545,6.167 173.545,9.167 174.545,9.167 174.545,7.167 	"/>
-	<rect x="169.546" y="11.167" fill="#1D1D1B" width="1.001" height="1"/>
-	<polygon fill="#1D1D1B" points="171.545,11.167 171.545,12.167 170.545,12.167 170.545,13.167 172.545,13.167 172.545,12.167 
-		173.545,12.167 173.545,11.167 	"/>
-	<polygon fill="#1D1D1B" points="180.545,11.167 180.545,12.167 181.545,12.167 181.545,13.167 182.545,13.167 182.545,11.167 	"/>
-	<rect x="173.545" y="13.167" fill="#1D1D1B" width="1" height="1"/>
-	<rect x="173.545" y="18.167" fill="#1D1D1B" width="1" height="1"/>
-	<rect x="174.545" y="19.167" fill="#1D1D1B" width="1" height="1"/>
-	<polygon fill="#1D1D1B" points="166.545,11.167 166.545,13.167 169.545,13.167 169.545,12.167 168.545,12.167 168.545,11.167 	"/>
-</g>
-</svg>
+<svg enable-background="new 162.458 0 24.088 24" height="24" viewBox="162.458 0 24.088 24" width="24.088" xmlns="http://www.w3.org/2000/svg"><g fill="#1d1d1b"><path d="m168.545 6.167h2v2h-2z"/><path d="m167.545 5.167h4.001v4.001h-4.001zm-1 5h6v-6h-6z"/><path d="m178.545 6.167h2v2h-2z"/><path d="m176.545 10.167h6v-6h-6zm5-1h-4v-4h4z"/><path d="m168.545 16.167h2v2h-2z"/><path d="m167.546 15.167h4.001v4.001h-4.001zm-1 5h5.999v-6h-5.999z"/><path d="m173.545 15.167v1h1.001v2h1v-4h-1v1z"/><path d="m177.545 16.167h1v1h-1zm1.999-1.001h1.002v2.002h-1.002zm-4.999-5.999v1h-1v1h1v2h2v5h1v1h-1v1h2v-1h.999v-1h1.001v1h-.875v1h2.875v-2h-1v-2h1v-1.001h-1v-1.999h-1v.999h-1.001v1h-1.999v-1.999h1v.999h.999v-.999h1.001v-1h-1.001v-1h-.999v1h-1v-1h-2v-2z"/><path d="m175.545 7.167v-3h-2v1h1v1h-1v3h1v-2z"/><path d="m169.546 11.167h1.001v1h-1.001z"/><path d="m171.545 11.167v1h-1v1h2v-1h1v-1z"/><path d="m180.545 11.167v1h1v1h1v-2z"/><path d="m173.545 13.167h1v1h-1z"/><path d="m173.545 18.167h1v1h-1z"/><path d="m174.545 19.167h1v1h-1z"/><path d="m166.545 11.167v2h3v-1h-1v-1z"/></g></svg>

app/images/search.svg

@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
-    <title>search</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Add-Tokens" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Metamascara---add-from-token-list-Copy-3" transform="translate(-345.000000, -350.000000)" fill="#9B9B9B" fill-rule="nonzero">
-            <g id="search" transform="translate(345.000000, 350.000000)">
-                <path d="M2.01875,6.90625 C2.01875,4.25 4.25,2.01875 6.90625,2.01875 C9.5625,2.01875 11.6875,4.14375 11.6875,6.90625 C11.6875,9.5625 9.5625,11.6875 6.90625,11.6875 C4.14375,11.6875 2.01875,9.5625 2.01875,6.90625 Z M16.575,15.0875 L12.325,10.8375 C13.175,9.66875 13.6,8.2875 13.6,6.8 C13.70625,3.08125 10.625,0 6.90625,0 C3.08125,0 0,3.08125 0,6.90625 C0,10.73125 3.08125,13.8125 6.90625,13.8125 C8.18125,13.8125 9.45625,13.3875 10.4125,12.75 L14.6625,17 L16.575,15.0875 Z" id="Page-1"></path>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="17" viewBox="0 0 17 17" width="17" xmlns="http://www.w3.org/2000/svg"><path d="m2.01875 6.90625c0-2.65625 2.23125-4.8875 4.8875-4.8875s4.78125 2.125 4.78125 4.8875c0 2.65625-2.125 4.78125-4.78125 4.78125-2.7625 0-4.8875-2.125-4.8875-4.78125zm14.55625 8.18125-4.25-4.25c.85-1.16875 1.275-2.55 1.275-4.0375.10625-3.71875-2.975-6.8-6.69375-6.8-3.825 0-6.90625 3.08125-6.90625 6.90625s3.08125 6.90625 6.90625 6.90625c1.275 0 2.55-.425 3.50625-1.0625l4.25 4.25z" fill="#9b9b9b"/></svg>

app/images/settings.svg

@@ -1,22 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 47 (45396) - http://www.bohemiancoding.com/sketch -->
-    <title>settings</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <polygon id="path-1" points="20 10 20 19.9998 0 19.9998 0 10 0 0.0002 20 0.0002"></polygon>
-    </defs>
-    <g id="MetaMascara-v2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="account-dropdown-top-bar-IXD" transform="translate(-25.000000, -826.000000)">
-            <g id="Group-6" transform="translate(4.000000, 646.000000)">
-                <g id="settings" transform="translate(21.000000, 180.000000)">
-                    <mask id="mask-2" fill="white">
-                        <use xlink:href="#path-1"></use>
-                    </mask>
-                    <g id="Clip-2"></g>
-                    <path d="M10,13.6602 C7.979,13.6602 6.34,12.0212 6.34,10.0002 C6.34,7.9782 7.979,6.3402 10,6.3402 C12.021,6.3402 13.66,7.9782 13.66,10.0002 C13.66,12.0212 12.021,13.6602 10,13.6602 L10,13.6602 Z M19.157,11.8112 C19.53,11.8112 19.878,11.5092 19.929,11.1392 C19.929,11.1392 20,10.6182 20,10.0002 C20,9.3822 19.929,8.8622 19.929,8.8622 C19.878,8.4922 19.53,8.1892 19.157,8.1892 L17.228,8.1892 C16.854,8.1892 16.466,7.9512 16.365,7.6602 C16.265,7.3682 16.127,6.4352 16.391,6.1712 L17.755,4.8072 C18.019,4.5432 18.039,4.0922 17.8,3.8052 L16.195,2.2002 C15.908,1.9602 15.458,1.9812 15.193,2.2452 L13.829,3.6092 C13.565,3.8732 13.125,3.9802 12.852,3.8462 C12.578,3.7122 11.812,3.1462 11.812,2.7732 L11.812,0.8432 C11.812,0.4702 11.509,0.1222 11.139,0.0722 C11.139,0.0722 10.619,0.0002 10,0.0002 C9.382,0.0002 8.862,0.0722 8.862,0.0722 C8.492,0.1222 8.189,0.4702 8.189,0.8432 L8.189,2.7732 C8.189,3.1462 7.951,3.5352 7.66,3.6352 C7.369,3.7352 6.435,3.8732 6.171,3.6092 L4.807,2.2452 C4.542,1.9812 4.092,1.9612 3.805,2.2002 L2.2,3.8052 C1.96,4.0922 1.981,4.5432 2.245,4.8072 L3.609,6.1712 C3.873,6.4352 3.98,6.8752 3.846,7.1482 C3.711,7.4222 3.146,8.1892 2.773,8.1892 L0.843,8.1892 C0.47,8.1892 0.123,8.4922 0.072,8.8622 C0.072,8.8622 0,9.3822 0,10.0002 C0,10.6182 0.072,11.1392 0.072,11.1392 C0.123,11.5092 0.47,11.8112 0.843,11.8112 L2.773,11.8112 C3.146,11.8112 3.535,12.0502 3.635,12.3412 C3.735,12.6322 3.874,13.5642 3.609,13.8292 L2.246,15.1932 C1.981,15.4572 1.961,15.9082 2.2,16.1952 L3.805,17.8002 C4.092,18.0392 4.542,18.0192 4.807,17.7552 L6.171,16.3902 C6.435,16.1272 6.875,16.0202 7.148,16.1542 C7.422,16.2882 8.189,16.8532 8.189,17.2272 L8.189,19.1572 C8.189,19.5302 8.492,19.8782 8.862,19.9292 C8.862,19.9292 9.382,20.0002 10,20.0002 C10.619,20.0002 11.139,19.9292 11.139,19.9292 C11.509,19.8772 11.812,19.5302 11.812,19.1572 L11.812,17.2272 C11.812,16.8532 12.05,16.4662 12.341,16.3652 C12.632,16.2642 13.565,16.1272 13.829,16.3902 L15.193,17.7552 C15.458,18.0182 15.908,18.0392 16.195,17.8002 L17.8,16.1952 C18.039,15.9082 18.02,15.4582 17.755,15.1932 L16.391,13.8292 C16.127,13.5652 16.021,13.1252 16.154,12.8512 C16.288,12.5782 16.854,11.8112 17.228,11.8112 L19.157,11.8112 Z" id="Fill-1" fill="#B3B3B3" mask="url(#mask-2)"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="20" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><mask id="a" fill="#fff"><path d="m20 10v9.9998h-20v-9.9998-9.9998h20z" fill="none"/></mask><path d="m10 13.6602c-2.021 0-3.66-1.639-3.66-3.66 0-2.022 1.639-3.66 3.66-3.66s3.66 1.638 3.66 3.66c0 2.021-1.639 3.66-3.66 3.66zm9.157-1.849c.373 0 .721-.302.772-.672 0 0 .071-.521.071-1.139s-.071-1.138-.071-1.138c-.051-.37-.399-.673-.772-.673h-1.929c-.374 0-.762-.238-.863-.529-.1-.292-.238-1.225.026-1.489l1.364-1.364c.264-.264.284-.715.045-1.002l-1.605-1.605c-.287-.24-.737-.219-1.002.045l-1.364 1.364c-.264.264-.704.371-.977.237-.274-.134-1.04-.7-1.04-1.073v-1.93c0-.373-.303-.721-.673-.771 0 0-.52-.072-1.139-.072-.618 0-1.138.072-1.138.072-.37.05-.673.398-.673.771v1.93c0 .373-.238.762-.529.862s-1.225.238-1.489-.026l-1.364-1.364c-.265-.264-.715-.284-1.002-.045l-1.605 1.605c-.24.287-.219.738.045 1.002l1.364 1.364c.264.264.371.704.237.977-.135.274-.7 1.041-1.073 1.041h-1.93c-.373 0-.72.303-.771.673 0 0-.072.52-.072 1.138s.072 1.139.072 1.139c.051.37.398.672.771.672h1.93c.373 0 .762.239.862.53s.239 1.223-.026 1.488l-1.363 1.364c-.265.264-.285.715-.046 1.002l1.605 1.605c.287.239.737.219 1.002-.045l1.364-1.365c.264-.263.704-.37.977-.236.274.134 1.041.699 1.041 1.073v1.93c0 .373.303.721.673.772 0 0 .52.071 1.138.071.619 0 1.139-.071 1.139-.071.37-.052.673-.399.673-.772v-1.93c0-.374.238-.761.529-.862s1.224-.238 1.488.025l1.364 1.365c.265.263.715.284 1.002.045l1.605-1.605c.239-.287.22-.737-.045-1.002l-1.364-1.364c-.264-.264-.37-.704-.237-.978.134-.273.7-1.04 1.074-1.04z" fill="#b3b3b3" fill-rule="evenodd" mask="url(#a)"/></svg>

app/images/switch_acc.svg

@@ -1,29 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<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"
-	 width="29.477px" height="24px" viewBox="78.469 0 29.477 24" enable-background="new 78.469 0 29.477 24" xml:space="preserve" fill="#F7861C">
-<g>
-	<path d="M90.437,9.087c0,1.669,1.423,4.766,3.177,4.766c1.755,0,3.177-3.097,3.177-4.766c0-1.668-1.422-3.021-3.177-3.021
-		C91.859,6.066,90.437,7.418,90.437,9.087z"/>
-	<path d="M93.613,17.091h4.042c1.108,0,1.503-0.249,1.503-0.84c0-1.21-1.158-2.147-2.867-2.62c-0.713,0.861-1.619,1.467-2.678,1.467
-		c-1.057,0-1.964-0.605-2.676-1.467c-1.709,0.473-2.867,1.41-2.867,2.62c0,0.591,0.395,0.84,1.502,0.84H93.613z"/>
-	<path d="M86.392,4.841c0.979-0.98,2.122-1.738,3.398-2.255c1.231-0.499,2.533-0.751,3.87-0.751c1.47,0,2.892,0.304,4.225,0.902
-		c0.166,0.075,0.36,0.039,0.488-0.09l0.558-0.556c0.101-0.101,0.146-0.244,0.122-0.384c-0.024-0.14-0.115-0.26-0.243-0.321
-		C97.218,0.624,95.437,0.22,93.66,0.22c-1.545,0-3.052,0.292-4.478,0.869c-1.477,0.598-2.8,1.476-3.933,2.609
-		c-1.775,1.774-2.924,4.021-3.325,6.495c-0.192,1.19-0.205,2.4-0.036,3.595c0.052,0.366,0.121,0.729,0.206,1.089l-0.732-0.497
-		c-0.199-0.136-0.472-0.083-0.608,0.117l-0.45,0.664c-0.065,0.097-0.089,0.214-0.067,0.329c0.021,0.114,0.088,0.214,0.184,0.28
-		l2.638,1.787l0.259,0.177c0.056,0.037,0.117,0.061,0.182,0.07c0.021,0.003,0.043,0.005,0.064,0.005
-		c0.028,0,0.056-0.002,0.083-0.008c0.006-0.001,0.011-0.002,0.016-0.004c0.107-0.024,0.202-0.089,0.264-0.18l1.965-2.897
-		c0.065-0.096,0.09-0.214,0.067-0.328s-0.088-0.215-0.185-0.28l-0.665-0.45c-0.199-0.136-0.472-0.084-0.607,0.116l-0.741,1.093
-		c-0.408-1.469-0.485-3.014-0.22-4.541C83.903,8.242,84.89,6.343,86.392,4.841z"/>
-	<path d="M106.979,8.028c-0.039-0.109-0.121-0.198-0.226-0.248l-2.443-1.142l0,0l-0.727-0.34c-0.22-0.102-0.48-0.007-0.583,0.211
-		l-1.482,3.17c-0.102,0.219-0.008,0.48,0.212,0.582l0.728,0.34c0.059,0.027,0.121,0.041,0.186,0.041c0.05,0,0.101-0.009,0.149-0.026
-		c0.108-0.039,0.198-0.121,0.247-0.226l0.509-1.087c0.43,1.52,0.505,3.12,0.213,4.694c-0.379,2.047-1.358,3.907-2.832,5.382
-		c-0.979,0.979-2.123,1.737-3.398,2.253c-1.231,0.499-2.534,0.752-3.87,0.752c-1.393,0-2.743-0.273-4.018-0.812
-		c-0.164-0.068-0.354-0.031-0.48,0.095l-0.561,0.561c-0.103,0.102-0.147,0.247-0.122,0.389c0.026,0.141,0.119,0.26,0.251,0.32
-		C90.264,23.632,91.968,24,93.661,24c1.545,0,3.053-0.292,4.478-0.87c1.477-0.598,2.8-1.475,3.934-2.608
-		c1.743-1.744,2.887-3.949,3.304-6.378c0.307-1.777,0.211-3.574-0.273-5.281l0.939,0.439c0.061,0.028,0.124,0.042,0.187,0.042
-		c0.164,0,0.322-0.094,0.396-0.253l0.34-0.727C107.015,8.258,107.021,8.138,106.979,8.028z"/>
-</g>
-</svg>
+<svg height="14" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m0 14v-1.75c0-2.362 4.638-3.5 7-3.5 2.363 0 7 1.138 7 3.5v1.75zm7-8a3 3 0 1 1 0-6 3 3 0 0 1 0 6z" fill="#6729a8" fill-rule="evenodd"/></svg>

app/images/tokensearch.svg

@@ -1,15 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="65px" height="58px" viewBox="0 0 65 58" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
-    <title>7FDB75AD-BD4D-497C-B391-69EEB31A0561</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Add-Tokens" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Add-tokens" transform="translate(-267.000000, -284.000000)" fill="#B8BAC1">
-            <g id="tokensearch" transform="translate(267.000000, 284.000000)">
-                <path d="M28.5322581,2.80645161 C42.4391613,2.80645161 54.1925806,9.22854839 54.2552581,16.8433871 C54.1925806,24.4591613 42.4391613,30.8821935 28.5322581,30.8821935 C14.6253548,30.8821935 2.87193548,24.4600968 2.80925806,16.8443226 C2.87193548,9.22854839 14.6253548,2.80645161 28.5322581,2.80645161 M28.5322581,36.7289677 C15.7432581,36.7289677 4.78125806,31.2975484 3.05154839,24.5012581 C7.70932258,29.9981613 17.2559355,33.6886452 28.5322581,33.6886452 C39.8085806,33.6886452 49.3551935,29.9981613 54.0129677,24.5012581 C52.2832581,31.2975484 41.3212581,36.7289677 28.5322581,36.7289677 M28.5322581,54.2692903 C15.7432581,54.2692903 4.78125806,48.837871 3.05154839,42.0415806 C7.70932258,47.5384839 17.2559355,51.2289677 28.5322581,51.2289677 C33.2237097,51.2289677 37.6083226,50.5844194 41.471871,49.4403226 C42.1379355,49.243871 42.5270968,48.5675161 42.4110968,47.8818065 C42.4045484,47.8453226 42.398,47.8079032 42.3923871,47.7704839 C42.2642258,46.9603548 41.439129,46.458 40.6533226,46.6946774 C37.0180323,47.792 32.8822581,48.4225161 28.5322581,48.4225161 C15.7432581,48.4225161 4.78125806,42.9910968 3.05154839,36.1948065 C7.70932258,41.6917097 17.2559355,45.3821935 28.5322581,45.3821935 C33.3649677,45.3821935 37.8730645,44.6983548 41.8217419,43.4906452 C42.2763871,43.3503226 42.6066129,42.976129 42.7422581,42.5196129 L42.7534839,42.4812581 C43.0752903,41.4082581 42.0733871,40.4063548 41.004129,40.7403226 C37.2846452,41.9040645 33.0225806,42.5757419 28.5322581,42.5757419 C15.7432581,42.5757419 4.78125806,37.1443226 3.05154839,30.3480323 C7.70932258,35.8449355 17.2559355,39.5354194 28.5322581,39.5354194 C39.8085806,39.5354194 49.3551935,35.8449355 54.0129677,30.3480323 L54.0129677,33.5492581 C54.0129677,34.3846452 54.6902581,35.0619355 55.5256452,35.0619355 C56.3610323,35.0619355 57.0383226,34.3902581 57.0392581,33.5558065 C57.0467419,26.4900968 57.0645161,16.9257097 57.0645161,16.905129 C57.0645161,16.8845484 57.0617097,16.8649032 57.0617097,16.8443226 C57.0617097,16.8237419 57.0645161,16.8031613 57.0645161,16.7825806 L57.0598387,16.7825806 C56.9513226,7.36225806 44.4616774,0 28.5322581,0 C12.6028387,0 0.113193548,7.36225806 0.00467741935,16.7825806 L0,16.7825806 C0,16.8031613 0.00280645161,16.8237419 0.00280645161,16.8443226 C0.00280645161,16.8649032 0,16.8845484 0,16.905129 C0,16.9322581 0.00467741935,19.3420645 0.0102903226,22.6293548 L0,22.6293548 C0,22.7154194 0.00841935484,22.7996129 0.0102903226,22.8838065 C0.0140322581,24.5957419 0.0177741935,26.5247097 0.0196451613,28.476129 L0,28.476129 C0,28.650129 0.0130967742,28.8222581 0.0205806452,28.9953226 C0.0243225806,30.828871 0.0280645161,32.6586774 0.0308709677,34.3229032 L0,34.3229032 C0,34.5857742 0.0140322581,34.8467742 0.0318064516,35.1059032 C0.036483871,37.3108387 0.0392903226,39.1406452 0.0411612903,40.1696774 L0,40.1696774 C0,40.4905484 0.0177741935,40.8086129 0.0458387097,41.123871 L0.0495806452,41.2033871 C0.0645483871,41.3699032 0.0935483871,41.5345484 0.116935484,41.700129 C0.130032258,41.7861935 0.137516129,41.8731935 0.152483871,41.9583226 C0.183354839,42.1416774 0.225451613,42.3240968 0.266612903,42.5055806 C0.29,42.6103548 0.308709677,42.7160645 0.334903226,42.8199032 C0.358290323,42.9078387 0.387290323,42.9939032 0.411612903,43.0818387 C2.00006452,48.7134516 8.12841935,53.3160323 16.5777097,55.5705484 C16.6010968,55.5770968 16.6254194,55.5836452 16.6488065,55.5892581 C16.9350645,55.6650323 17.2213226,55.739871 17.5122581,55.8109677 C20.9099355,56.6538387 24.6322258,57.1215806 28.5322581,57.1215806 C32.4322903,57.1215806 36.1545806,56.6538387 39.5522581,55.8109677 C39.8431935,55.739871 40.1294516,55.6650323 40.4157097,55.5892581 C40.4390968,55.5836452 40.4634194,55.5770968 40.4868065,55.5705484 C41.5766452,55.2796129 42.6253226,54.9475161 43.6319032,54.579871 C44.4682258,54.2739677 44.7675806,53.2627097 44.2652258,52.5274194 C44.2437097,52.4956129 44.2212581,52.462871 44.1997419,52.430129 C43.8423871,51.8950323 43.1688387,51.6873548 42.5645161,51.9090645 C38.4998387,53.3955484 33.6624516,54.2692903 28.5322581,54.2692903" id="Fill-1"></path>
-                <path d="M64.3227484,54.3991355 L60.4535871,50.5299742 C61.4526839,49.1566839 61.9522323,47.5345548 61.9522323,45.7880065 C62.1009742,40.5661355 56.8996839,36.4144581 51.4654581,38.2367806 C48.6131677,39.1928452 46.4821355,41.7401677 46.0611677,44.7187484 C45.3530065,49.7460387 49.205329,54.0249419 54.0894903,54.0249419 C55.5872,54.0249419 57.0849097,53.5244581 58.2074903,52.7770065 L62.0766516,56.6452323 C62.6968774,57.2654581 63.7025226,57.2654581 64.3227484,56.6452323 C64.9429742,56.0250065 64.9429742,55.0193613 64.3227484,54.3991355 M48.3484258,45.9124258 C48.3484258,42.7925871 50.9696516,40.1713613 54.0894903,40.1713613 C57.209329,40.1713613 59.7052,42.6681677 59.7052,45.9124258 C59.7052,49.0332 57.209329,51.529071 54.0894903,51.529071 C50.8452323,51.529071 48.3484258,49.0332 48.3484258,45.9124258" id="Fill-3"></path>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="58" viewBox="0 0 65 58" width="65" xmlns="http://www.w3.org/2000/svg"><g fill="#b8bac1" fill-rule="evenodd"><path d="m28.5322581 2.80645161c13.9069032 0 25.6603225 6.42209678 25.723 14.03693549-.0626775 7.6157742-11.8160968 14.0388064-25.723 14.0388064-13.9069033 0-25.66032262-6.4220967-25.72300004-14.0378709.06267742-7.61577421 11.81609674-14.03787099 25.72300004-14.03787099m0 33.92251609c-12.789 0-23.75100004-5.4314193-25.48070971-12.2277096 4.65777419 5.4969032 14.20438711 9.1873871 25.48070971 9.1873871 11.2763225 0 20.8229354-3.6904839 25.4807096-9.1873871-1.7297096 6.7962903-12.6917096 12.2277096-25.4807096 12.2277096m0 17.5403226c-12.789 0-23.75100004-5.4314193-25.48070971-12.2277097 4.65777419 5.4969033 14.20438711 9.1873871 25.48070971 9.1873871 4.6914516 0 9.0760645-.6445483 12.9396129-1.7886451.6660645-.1964516 1.0552258-.8728065.9392258-1.5585161-.0065484-.0364839-.0130968-.0739033-.0187097-.1113226-.1281613-.8101291-.9532581-1.3124839-1.7390645-1.0758065-3.6352903 1.0973226-7.7710645 1.7278387-12.1210645 1.7278387-12.789 0-23.75100004-5.4314193-25.48070971-12.2277096 4.65777419 5.4969032 14.20438711 9.187387 25.48070971 9.187387 4.8327096 0 9.3408064-.6838387 13.2894838-1.8915483.4546452-.1403226.784871-.5145162.9205162-.9710323l.0112258-.0383548c.3218064-1.073-.6800968-2.0749033-1.7493549-1.7409355-3.7194838 1.1637419-7.9815484 1.8354193-12.4718709 1.8354193-12.789 0-23.75100004-5.4314193-25.48070971-12.2277096 4.65777419 5.4969032 14.20438711 9.1873871 25.48070971 9.1873871 11.2763225 0 20.8229354-3.6904839 25.4807096-9.1873871v3.2012258c0 .8353871.6772904 1.5126774 1.5126775 1.5126774s1.5126774-.6716774 1.5136129-1.506129c.0074838-7.0657097.025258-16.6300968.025258-16.6506775 0-.0205806-.0028064-.0402258-.0028064-.0608064 0-.0205807.0028064-.0411613.0028064-.061742h-.0046774c-.1085161-9.42032254-12.5981613-16.7825806-28.5275806-16.7825806-15.9294194 0-28.41906455 7.36225806-28.52758068 16.7825806h-.00467742c0 .0205807.00280645.0411613.00280645.061742 0 .0205806-.00280645.0402258-.00280645.0608064 0 .0271291.00467742 2.4369355.01029032 5.7242258h-.01029032c0 .0860646.00841935.1702581.01029032.2544517.00374194 1.7119354.00748387 3.6409032.00935484 5.5923225h-.01964516c0 .174.01309677.3461291.02058065.5191936.00374193 1.8335484.00748387 3.6633548.01029032 5.3275806h-.03087097c0 .262871.01403226.523871.03180645.783.00467742 2.2049355.00748387 4.034742.00935484 5.0637742h-.04116129c0 .320871.01777419.6389355.04583871.9541936l.00374194.0795161c.01496774.1665161.04396774.3311613.06735483.4967419.01309678.0860645.02058065.1730645.03554839.2581936.03087097.1833548.07296774.3657742.11412903.547258.0233871.1047742.04209678.2104839.06829033.3143226.02338709.0879355.05238709.174.07670967.2619355 1.58845162 5.6316129 7.71680645 10.2341936 16.1660968 12.4887097.0233871.0065484.0477097.0130968.0710968.0187097.286258.0757742.5725161.1506129.8634516.2217096 3.3976774.842871 7.1199677 1.3106129 11.02 1.3106129 3.9000322 0 7.6223225-.4677419 11.02-1.3106129.2909354-.0710967.5771935-.1459354.8634516-.2217096.0233871-.0056129.0477097-.0121613.0710968-.0187097 1.0898387-.2909355 2.1385161-.6230323 3.1450967-.9906774.8363226-.3059033 1.1356774-1.3171613.6333226-2.0524516-.0215161-.0318065-.0439677-.0645484-.0654839-.0972904-.3573548-.5350967-1.0309032-.7427742-1.6352258-.5210645-4.0646774 1.4864839-8.9020645 2.3602258-14.032258 2.3602258"/><path d="m64.3227484 54.3991355-3.8691613-3.8691613c.9990968-1.3732903 1.4986452-2.9954194 1.4986452-4.7419677.1487419-5.221871-5.0525484-9.3735484-10.4867742-7.5512259-2.8522904.9560646-4.9833226 3.5033871-5.4042904 6.4819678-.7081612 5.0272903 3.1441613 9.3061935 8.0283226 9.3061935 1.4977097 0 2.9954194-.5004838 4.118-1.2479354l3.8691613 3.8682258c.6202258.6202258 1.625871.6202258 2.2460968 0s.6202258-1.625871 0-2.2460968m-15.9743226-8.4867097c0-3.1198387 2.6212258-5.7410645 5.7410645-5.7410645s5.6157097 2.4968064 5.6157097 5.7410645c0 3.1207742-2.495871 5.6166452-5.6157097 5.6166452-3.244258 0-5.7410645-2.495871-5.7410645-5.6166452"/></g></svg>

app/images/warning.svg

@@ -1,22 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="33px" height="32px" viewBox="0 0 33 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 49.3 (51167) - http://www.bohemiancoding.com/sketch -->
-    <title>Group 7</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Reveal-Seedphrase" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Seed-phrase-2" transform="translate(-29.000000, -155.000000)">
-            <g id="Group-2" transform="translate(0.000000, 132.000000)">
-                <g id="Group" transform="translate(28.000000, 19.000000)">
-                    <g id="Group-19-Copy-2" transform="translate(0.000000, 3.000000)">
-                        <g id="Group-7">
-                            <path d="M20.1321134,3.85444772 L32.5721829,26.6020033 C33.367162,28.0556794 32.8331826,29.8785746 31.3795065,30.6735537 C30.9381289,30.9149321 30.4431378,31.0414403 29.9400695,31.0414403 L5.05993054,31.0414403 C3.40307629,31.0414403 2.05993054,29.6982946 2.05993054,28.0414403 C2.05993054,27.538372 2.18643873,27.0433809 2.42781712,26.6020033 L14.8678866,3.85444772 C15.6628657,2.40077162 17.4857609,1.86679221 18.939437,2.66177133 C19.442875,2.93708896 19.8567958,3.35100977 20.1321134,3.85444772 Z" id="Triangle-2-Copy" stroke="#FF001F" stroke-width="2"></path>
-                            <rect id="Rectangle-5" fill="#FF001F" x="16" y="9" width="3" height="13"></rect>
-                            <rect id="Rectangle-5-Copy" fill="#FF001F" x="16" y="24" width="3" height="3"></rect>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg height="32" viewBox="0 0 33 32" width="33" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" transform="translate(-1 -1)"><path d="m20.1321134 3.85444772 12.4400695 22.74755558c.7949791 1.4536761.2609997 3.2765713-1.1926764 4.0715504-.4413776.2413784-.9363687.3678866-1.439437.3678866h-24.88013896c-1.65685425 0-3-1.3431457-3-3 0-.5030683.12650819-.9980594.36788658-1.439437l12.44006948-22.74755558c.7949791-1.4536761 2.6178743-1.98765551 4.0715504-1.19267639.503438.27531763.9173588.68923844 1.1926764 1.19267639z" stroke="#ff001f" stroke-width="2"/><g fill="#ff001f"><path d="m16 9h3v13h-3z"/><path d="m16 24h3v3h-3z"/></g></g></svg>

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "4.8.2",
+  "version": "4.8.3",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "__MSG_appDescription__",

app/scripts/background.js

@@ -37,7 +37,7 @@ const {
 const STORAGE_KEY = 'metamask-config'
 const METAMASK_DEBUG = process.env.METAMASK_DEBUG
 
-log.setDefaultLevel(process.env.METAMASK_DEBUG ? 'debug' : 'warn')
+log.setDefaultLevel(METAMASK_DEBUG ? 'debug' : 'warn')
 
 const platform = new ExtensionPlatform()
 const notificationManager = new NotificationManager()

app/scripts/controllers/preferences.js

@@ -343,6 +343,21 @@ class PreferencesController {
     return this.store.getState().frequentRpcList
   }
 
+  /**
+   * Removes a specified rpc url from the list.
+   *
+   * @param {string} url
+   * @returns {Promise<array>} The new array of updated RpcList objects
+   *
+   */
+  removeRpcUrl (_url) {
+    const rpcList = this.getFrequentRpcList()
+    const updatedRpcList = rpcList.filter(rpcUrl => rpcUrl !== _url)
+    this.store.updateState({ frequentRpcList: updatedRpcList })
+
+    return Promise.resolve(updatedRpcList)
+  }
+
   /**
    * Updates the `featureFlags` property, which is an object. One property within that object will be set to a boolean.
    *

app/scripts/lib/setupRaven.js

@@ -1,8 +1,8 @@
 const Raven = require('raven-js')
 const METAMASK_DEBUG = process.env.METAMASK_DEBUG
 const extractEthjsErrorMessage = require('./extractEthjsErrorMessage')
-const PROD = 'https://1cbad94ab42e4d40a17cbfee0c30e1cb@sentry.io/1246874'
-const DEV = 'https://9c6228ffe5604981b910275fbfb3fa33@sentry.io/1246875'
+const PROD = 'https://3bd485f8ed6047d882f3f010cbae46ca@sentry.io/1250701'
+const DEV = 'https://267dbd2f3447444faa637bc34bcc7317@sentry.io/1253429'
 
 module.exports = setupRaven
 

app/scripts/metamask-controller.js

@@ -392,6 +392,7 @@ module.exports = class MetamaskController extends EventEmitter {
       setSelectedAddress: nodeify(preferencesController.setSelectedAddress, preferencesController),
       addToken: nodeify(preferencesController.addToken, preferencesController),
       removeToken: nodeify(preferencesController.removeToken, preferencesController),
+      removeRpcUrl: nodeify(preferencesController.removeRpcUrl, preferencesController),
       setCurrentAccountTab: nodeify(preferencesController.setCurrentAccountTab, preferencesController),
       setAccountLabel: nodeify(preferencesController.setAccountLabel, preferencesController),
       setFeatureFlag: nodeify(preferencesController.setFeatureFlag, preferencesController),

app/scripts/platforms/extension.js

@@ -56,11 +56,11 @@ class ExtensionPlatform {
 
     this._subscribeToNotificationClicked()
 
-    const url = explorerLink(txMeta.hash, parseInt(txMeta.metamaskNetworkId))
+    const { url, explorerName } = this._getExplorer(txMeta.hash, parseInt(txMeta.metamaskNetworkId))
     const nonce = parseInt(txMeta.txParams.nonce, 16)
 
     const title = 'Confirmed transaction'
-    const message = `Transaction ${nonce} confirmed! View on EtherScan`
+    const message = `Transaction ${nonce} confirmed! View on ${explorerName}`
     this._showNotification(title, message, url)
   }
 
@@ -90,10 +90,30 @@ class ExtensionPlatform {
   }
 
   _viewOnEtherScan (txId) {
-    if (txId.startsWith('http://')) {
+    if (txId.startsWith('http://') || txId.startsWith('https://')) {
       global.metamaskController.platform.openWindow({ url: txId })
     }
   }
+
+  _getExplorer (hash, networkId) {
+    if (networkId === 99) {
+      return {
+        explorerName: 'POA explorer',
+        url: `https://poaexplorer.com/txid/search/${hash}`,
+      }
+    } else if (networkId === 77) {
+      return {
+        explorerName: 'POA explorer',
+        url: `https://sokol.poaexplorer.com/txid/search/${hash}`,
+      }
+    } else {
+      return {
+        explorerName: 'Etherscan',
+        url: explorerLink(hash, networkId),
+      }
+    }
+  }
+
 }
 
 module.exports = ExtensionPlatform

colors.js

@@ -0,0 +1,12 @@
+module.exports = [
+	'#5bdd95',
+  '#5bddcf',
+  '#47b1ee',
+  '#3677ee',
+  '#7e27d0',
+  '#631fa3',
+  '#d025ce',
+  '#f12498',
+  '#f1611a',
+  '#f8c013',
+]

development/metamaskbot-build-announce.js

@@ -6,6 +6,7 @@ start().catch(console.error)
 
 async function start () {
 
+  console.log('VERSION', VERSION)
   const GITHUB_COMMENT_TOKEN = process.env.GITHUB_COMMENT_TOKEN
   const CIRCLE_PULL_REQUEST = process.env.CIRCLE_PULL_REQUEST
   console.log('CIRCLE_PULL_REQUEST', CIRCLE_PULL_REQUEST)

development/publish-release.js

@@ -0,0 +1,90 @@
+const GITHUB_TOKEN = process.env.GITHUB_TOKEN
+const request = require('request-promise')
+const VERSION = require('../dist/chrome/manifest.json').version
+const fs = require('fs')
+
+publishRelease().then(function () {
+  console.log('Published')
+})
+
+/**
+ * Creates release. Adds tag from the current commit, current version is used as part of the tag name.
+ * Then uploads assets that were created while building.
+ * @returns {Promise.<void>}
+ */
+async function publishRelease () {
+  const CIRCLE_SHA1 = process.env.CIRCLE_SHA1
+  console.log(`VERSION: ${VERSION}, CIRCLE_SHA1: ${CIRCLE_SHA1}`)
+  let releaseId
+  const CREATE_RELEASE_URI = `https://api.github.com/repos/poanetwork/metamask-extension/releases`
+  console.log(`CREATE_RELEASE_URI: ${CREATE_RELEASE_URI}`)
+  let changelog = ''
+  try {
+    changelog = fs.readFileSync('./CHANGELOG.md').toString().split(VERSION)[1].split('##')[0].trim()
+  } catch (err) {
+    console.error(`Error in getting changelog: ${err}`)
+  }
+  // remove first line with date
+  const newLineIndex = changelog.indexOf('\n')
+  let changes = 'New release is ready.'
+  if (newLineIndex !== -1) {
+    changes = changelog.slice(newLineIndex + 1)
+  }
+  console.log(`changes: ${changes}`)
+
+  request({
+    method: 'POST',
+    uri: CREATE_RELEASE_URI,
+    headers: {
+      'User-Agent': 'Nifty Wallet',
+      'Authorization': `token ${GITHUB_TOKEN}`,
+    },
+    body: JSON.stringify({
+      body: changes,
+      tag_name: `v${VERSION}`,
+      name: `Version ${VERSION}`,
+      target_commitish: CIRCLE_SHA1,
+      draft: true,
+    }),
+  }).then(async function (response) {
+    console.log('response: ' + response)
+    releaseId = JSON.parse(response).id
+    console.log(`releaseId: ${releaseId}`)
+
+    return uploadAsset(`./builds/metamask-chrome-${VERSION}.zip`, `metamask-chrome-${VERSION}.zip`, releaseId)
+      .then(() => {
+        return uploadAsset(`./builds/metamask-firefox-${VERSION}.zip`, `metamask-firefox-${VERSION}.zip`, releaseId)
+      })
+      .then(() => {
+        return uploadAsset(`./builds/metamask-edge-${VERSION}.zip`, `metamask-edge-${VERSION}.zip`, releaseId)
+      })
+      .then(() => {
+        return uploadAsset(`./builds/metamask-opera-${VERSION}.zip`, `metamask-opera-${VERSION}.zip`, releaseId)
+      })
+  }).catch(function (err) {
+    console.error('error in request:' + err)
+    throw err
+  })
+}
+
+/**
+ * Uploads asset to the created release
+ * @param path - where file is located
+ * @param name - will be displayed on the release page
+ * @param releaseId - id or the release obtained after release creation
+ * @returns {Promise.<*>}
+ */
+async function uploadAsset (path, name, releaseId) {
+  const UPLOAD_ASSET_URL = `https://uploads.github.com/repos/poanetwork/metamask-extension/releases/${releaseId}/assets?name=${name}&label=${name}`
+  console.log(`UPLOAD_ASSET_URL: ${UPLOAD_ASSET_URL}`)
+  return request({
+    method: 'POST',
+    uri: UPLOAD_ASSET_URL,
+    body: fs.readFileSync(path),
+    headers: {
+      'Authorization': `token ${GITHUB_TOKEN}`,
+      'Content-Type': 'application/zip',
+      'User-Agent': 'Nifty Wallet',
+    },
+  })
+}

development/sentry-publish.js

@@ -20,27 +20,27 @@ async function start () {
 
   // create sentry release
   console.log(`creating Sentry release for "${VERSION}"...`)
-  await exec(`sentry-cli releases --org 'metamask' --project 'metamask' new ${VERSION}`)
+  await exec(`sentry-cli releases --org 'poa-network' --project 'nifty-wallet' new ${VERSION}`)
   console.log(`removing any existing files from Sentry release "${VERSION}"...`)
-  await exec(`sentry-cli releases --org 'metamask' --project 'metamask' files ${VERSION} delete --all`)
+  await exec(`sentry-cli releases --org 'poa-network' --project 'nifty-wallet' files ${VERSION} delete --all`)
   // upload sentry source and sourcemaps
   console.log(`uploading source files Sentry release "${VERSION}"...`)
-  await exec(`for FILEPATH in ./dist/chrome/*.js; do [ -e $FILEPATH ] || continue; export FILE=\`basename $FILEPATH\` && echo uploading $FILE && sentry-cli releases --org 'metamask' --project 'metamask' files ${VERSION} upload $FILEPATH metamask/$FILE; done;`)
+  await exec(`for FILEPATH in ./dist/chrome/*.js; do [ -e $FILEPATH ] || continue; export FILE=\`basename $FILEPATH\` && echo uploading $FILE && sentry-cli releases --org 'poa-network' --project 'nifty-wallet' files ${VERSION} upload $FILEPATH metamask/$FILE; done;`)
   console.log(`uploading sourcemaps Sentry release "${VERSION}"...`)
-  await exec(`sentry-cli releases --org 'metamask' --project 'metamask' files ${VERSION} upload-sourcemaps ./dist/sourcemaps/ --url-prefix 'sourcemaps'`)
+  await exec(`sentry-cli releases --org 'poa-network' --project 'nifty-wallet' files ${VERSION} upload-sourcemaps ./dist/sourcemaps/ --url-prefix 'sourcemaps'`)
   console.log('all done!')
 }
 
 async function checkIfAuthWorks () {
   const itWorked = await doesNotFail(async () => {
-    await exec(`sentry-cli releases --org 'metamask' --project 'metamask' list`)
+    await exec(`sentry-cli releases --org 'poa-network' --project 'nifty-wallet' list`)
   })
   return itWorked
 }
 
 async function checkIfVersionExists () {
   const versionAlreadyExists = await doesNotFail(async () => {
-    await exec(`sentry-cli releases --org 'metamask' --project 'metamask' info ${VERSION}`)
+    await exec(`sentry-cli releases --org 'poa-network' --project 'nifty-wallet' info ${VERSION}`)
   })
   return versionAlreadyExists
 }

notices/archive/notice_0.md

@@ -1,7 +1,13 @@
+Dear Nifty Wallet Users,
+
+Nifty Wallet is beta software. 
+
+When you log in to Nifty Wallet, your current account's address is visible to every new site you visit. This can be used to look up your account balances of Ether and other tokens.
+
+For your privacy, for now, please sign out of Nifty Wallet when you're done using a site.
+
+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 Nifty Wallet window on the page asking for user's seed phrases. Nifty Wallet will never open itself in this way.
+
 ## Related Links ##
 
-**[Terms of Use](https://github.com/poanetwork/metamask-extension/wiki)**
-
-**[Privacy](https://github.com/poanetwork/metamask-extension/wiki)**
-
-**[Attributions](https://github.com/poanetwork/metamask-extension/wiki)**
+**[Terms of Service](https://github.com/poanetwork/metamask-extension/wiki/Terms-of-Service)**

notices/notices.js

@@ -10,26 +10,4 @@ module.exports = [
     title: 'Terms of Use',
     body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_0.md'), 'utf8'),
   },
-  {
-    id: 2,
-    read: false,
-    date: 'Mon May 08 2017',
-    title: 'Privacy Notice',
-    body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_2.md'), 'utf8'),
-  },
-  {
-    id: 3,
-    read: false,
-    date: 'Tue Nov 28 2017',
-    title: 'Seed Phrase Alert',
-    firstVersion: '<=3.12.0',
-    body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_3.md'), 'utf8'),
-  },
-  {
-    id: 4,
-    read: false,
-    date: 'Wed Jun 13 2018',
-    title: 'Phishing Warning',
-    body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_4.md'), 'utf8'),
-  },
 ]

old-ui/app/account-detail.js

@@ -56,8 +56,9 @@ AccountDetailScreen.prototype.render = function () {
     // identicon, label, balance, etc
       h('.account-data-subsection', {
         style: {
-          margin: '0 20px',
+          padding: '0 20px',
           flex: '1 0 auto',
+          background: 'linear-gradient(rgb(84, 36, 147), rgb(104, 45, 182))',
         },
       }, [
 
@@ -74,7 +75,7 @@ AccountDetailScreen.prototype.render = function () {
           // large identicon and addresses
           h('.identicon-wrapper.select-none', [
             h(Identicon, {
-              diameter: 62,
+              diameter: 60,
               address: selected,
             }),
           ]),
@@ -122,6 +123,7 @@ AccountDetailScreen.prototype.render = function () {
                           textOverflow: 'ellipsis',
                           padding: '5px 0px',
                           lineHeight: '25px',
+                          color: '#ffffff',
                         },
                       }, [
                         identity && identity.name,
@@ -132,7 +134,7 @@ AccountDetailScreen.prototype.render = function () {
                     AccountDropdowns,
                     {
                       style: {
-                        marginRight: '8px',
+                        marginRight: '-7px',
                         marginLeft: 'auto',
                         cursor: 'pointer',
                       },
@@ -162,16 +164,16 @@ AccountDetailScreen.prototype.render = function () {
                   paddingTop: '3px',
                   width: '5em',
                   height: '15px',
-                  fontSize: '13px',
-                  fontFamily: 'Montserrat Light',
+                  fontSize: '14px',
+                  fontFamily: 'Nunito Bold',
                   textRendering: 'geometricPrecision',
                   marginBottom: '15px',
-                  color: '#AEAEAE',
+                  color: 'rgba(255, 255, 255, 0.7)',
                 },
               }, checksumAddress),
             ]),
 
-            // account ballence
+            // account ballance
 
           ]),
         ]),
@@ -198,7 +200,7 @@ AccountDetailScreen.prototype.render = function () {
           h('button', {
             onClick: () => props.dispatch(actions.buyEthView(selected)),
             style: { marginRight: '10px' },
-          }, 'BUY'),
+          }, 'Buy'),
 
           h('button', {
             onClick: () => props.dispatch(actions.showSendPage()),
@@ -206,7 +208,7 @@ AccountDetailScreen.prototype.render = function () {
               marginBottom: '20px',
               marginRight: '8px',
             },
-          }, 'SEND'),
+          }, 'Send'),
 
         ]),
       ]),

old-ui/app/accounts/import/index.js

@@ -34,12 +34,20 @@ AccountImportSubview.prototype.render = function () {
   const { type } = state
 
   return (
-    h('div', [
+    h('div', {
+      style: {
+        width: '100%',
+      },
+    }, [
       h('.section-title.flex-row.flex-center', [
         h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', {
           onClick: (event) => {
             props.dispatch(actions.goHome())
           },
+          style: {
+            position: 'absolute',
+            left: '30px',
+          },
         }),
         h('h2.page-subtitle', 'Import Accounts'),
       ]),
@@ -47,31 +55,18 @@ AccountImportSubview.prototype.render = function () {
         style: {
           display: 'inline-block',
           alignItems: 'center',
-          padding: '5px 15px 0px 15px',
+          padding: '5px 30px 0px 30px',
         },
       }, [
-        h('span', 'Imported accounts will not be associated with your originally created Nifty Wallet account seedphrase. Learn more about imported accounts '),
-        h('span', {
-          style: {
-            color: 'rgba(247, 134, 28, 1)',
-            cursor: 'pointer',
-            textDecoration: 'underline',
-          },
-          onClick: () => {
-            global.platform.openWindow({
-              url: 'https://metamask.helpscoutdocs.com/article/17-what-are-loose-accounts',
-            })
-          },
-        }, 'here.'),
+        h('span', 'Imported accounts will not be associated with your originally created Nifty Wallet account seedphrase.'),
       ]),
       h('div', {
         style: {
-          padding: '10px',
-          color: 'rgb(174, 174, 174)',
+          padding: '10px 30px',
         },
       }, [
 
-        h('h3', { style: { padding: '3px' } }, 'SELECT TYPE'),
+        h('h3', { style: { padding: '3px' } }, 'Select Type'),
 
         h('style', `
           .has-value.Select--single > .Select-control .Select-value .Select-value-label, .Select-value-label {

old-ui/app/accounts/import/json.js

@@ -5,8 +5,6 @@ const actions = require('../../../../ui/app/actions')
 const FileInput = require('react-simple-file-input').default
 const PropTypes = require('prop-types')
 
-const HELP_LINK = 'https://github.com/MetaMask/faq/blob/master/README.md#q-i-cant-use-the-import-feature-for-uploading-a-json-file-the-window-keeps-closing-when-i-try-to-select-a-file'
-
 class JsonImportSubview extends Component {
   constructor (props) {
     super(props)
@@ -26,15 +24,11 @@ class JsonImportSubview extends Component {
           display: 'flex',
           flexDirection: 'column',
           alignItems: 'center',
-          padding: '5px 15px 0px 15px',
+          padding: '5px 30px 0px 30px',
         },
       }, [
 
         h('p', 'Used by a variety of different clients'),
-        h('a.warning', {
-          href: HELP_LINK,
-          target: '_blank',
-        }, 'File import not working? Click here!'),
 
         h(FileInput, {
           readAs: 'text',
@@ -51,15 +45,16 @@ class JsonImportSubview extends Component {
           id: 'json-password-box',
           onKeyPress: this.createKeyringOnEnter.bind(this),
           style: {
-            width: 260,
+            width: '100%',
             marginTop: 12,
+            border: '1px solid #e2e2e2',
           },
         }),
 
-        h('button.primary', {
+        h('button', {
           onClick: this.createNewKeychain.bind(this),
           style: {
-            margin: 12,
+            margin: 20,
           },
         }, 'Import'),