From 2d0283363d4a3036b32236bc1aad7323e4853ece Mon Sep 17 00:00:00 2001
From: Petar Baykov <petbaik26@gmail.com>
Date: Tue, 21 Apr 2020 15:50:13 +0300
Subject: [PATCH 01/14] Fixes from feedback and test report

* Show claim button in mobile but disabled and on click show modal with message
* Add more info in show seed phrase page
* Disable confirm modal when send tip to unverified url until have endpoint returning problematic for claim urls
* Fix of text in edit tip details button
* Show better error message when backend payfortx times out (when claim medium url for instance)
* Remove cofirm url button when manually enter tip url
* Fix problem with showing amount when tx is name claim
---
 src/popup/locales/en.json                     | 11 ++-
 src/popup/router/components/BoxButton.vue     | 12 ++-
 src/popup/router/components/ClaimTips.vue     | 90 +++++++++++--------
 src/popup/router/components/Loader.vue        | 21 +++--
 .../router/components/TransactionItem.vue     |  7 +-
 src/popup/router/pages/Account.vue            |  3 +-
 src/popup/router/pages/Receive.vue            |  2 +-
 src/popup/router/pages/Retip.vue              | 10 ++-
 src/popup/router/pages/TipPage.vue            | 45 ++++++----
 src/popup/utils/helper.js                     |  5 ++
 10 files changed, 129 insertions(+), 77 deletions(-)

diff --git a/src/popup/locales/en.json b/src/popup/locales/en.json
index ff4a34837..506291d54 100644
--- a/src/popup/locales/en.json
+++ b/src/popup/locales/en.json
@@ -176,7 +176,9 @@
       "tipsOnUrl": "Tips on this URL",
       "urlNotExisting": "Tip for this url does not exist",
       "moreOracles": "There are not enough active oracles to verify your claim request, please try again later.",
-      "oracleFailed": "Oracle service check claim failed, please try again later."
+      "oracleFailed": "Oracle service check claim failed, please try again later.",
+      "unknownError": "Error occured during claim request, please try again later.",
+      "noMobileClaim": "Claiming is currently only available on the web extension on desktop"
     },
     "accountPassword": {
       "heading": "",
@@ -437,7 +439,7 @@
       "decryptingPrivateKey": "Decrypting private key",
       "showSeedPhrase": "Show seed phrase",
       "seedRecoveryHeading": "Show seed phrase",
-      "seedRecoverySmall": "Reveals your 12 words used for generating your private key",
+      "seedRecoverySmall": "Your seed phrase (also referred to as private key) serves as the keys or a password to access your account. Never disclose this to anyone. And make sure you back it up on a piece of paper that no one else can see—but that you will never lose. Losing these keys means losing access to your wallet and tips",
       "seedRecoveryBtn": "Show seed phrase",
       "seedPhraseWarning": "Do not share your seed with anyone, it can be used to steal all your accounts",
       "seedPhrase": "Your seed phrase",
@@ -628,11 +630,12 @@
       "availableLabel": "Available",
       "confirm": "Confirm",
       "cancel": "Cancel",
-      "edit": "Edit AE Details",
+      "edit": "Edit Tip Details",
       "whatIsVerifieddUrl": "What is \"Verified\" URL?",
       "whatIsNotVerifiedUrl": "What is \"Not verified\" URL?",
       "notVerifiedUrlInfo": "This URL has not yet been verified. Third party issues prevent us to ensure that tips will be directly delivered to the URL owner. You are sending the tip at your own risk.",
-      "verifiedUrlInfo": "If a URL is marked as verified, it means the owner of this URL is already a fellow Superhero — and that is awesome! An AE address has been included in the URL and tips can be claimed."
+      "verifiedUrlInfo": "If a URL is marked as verified, it means the owner of this URL is already a fellow Superhero — and that is awesome! An AE address has been included in the URL and tips can be claimed.",
+      "enterUrl": "Enter tip url"
     },
     "successTip": {
       "sendMore": "Send More AE",
diff --git a/src/popup/router/components/BoxButton.vue b/src/popup/router/components/BoxButton.vue
index 6f6681fa2..38dd570d3 100644
--- a/src/popup/router/components/BoxButton.vue
+++ b/src/popup/router/components/BoxButton.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="button-container">
-    <div class="button-content" @click="handleClick">
+    <div class="button-content" @click="handleClick" :class="{ disabled }">
       <slot name="icon" />
       <span class="button-text" :class="accent ? 'button-text-accent' : ''">{{ text }}</span>
     </div>
@@ -16,6 +16,11 @@ export default {
     },
     to: String,
     accent: Boolean,
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
   },
   methods: {
     handleClick() {
@@ -58,6 +63,11 @@ export default {
         color: $accent-color;
       }
     }
+
+    &.disabled {
+      pointer-events: all;
+      opacity: 0.3;
+    }
   }
 }
 </style>
diff --git a/src/popup/router/components/ClaimTips.vue b/src/popup/router/components/ClaimTips.vue
index 3fbaff100..fad945a2f 100644
--- a/src/popup/router/components/ClaimTips.vue
+++ b/src/popup/router/components/ClaimTips.vue
@@ -1,5 +1,11 @@
 <template>
-  <BoxButton :text="$t('pages.account.claim')" accent @handleClick="claimTips" class="tour__step4">
+  <BoxButton
+    :text="$t('pages.account.claim')"
+    accent
+    @handleClick="claimTips"
+    class="tour__step4"
+    :disabled="IS_MOBILE"
+  >
     <Claim slot="icon" />
   </BoxButton>
 </template>
@@ -18,44 +24,54 @@ export default {
     BoxButton,
   },
   computed: mapGetters(['sdk', 'tipping', 'account', 'popup']),
+  data: () => ({ IS_MOBILE: !process.env.IS_EXTENSION }),
   methods: {
     async claimTips() {
-      this.$emit('setLoading', true);
-      await this.$watchUntilTruly(() => this.sdk);
-      await this.$watchUntilTruly(() => this.tipping);
-      const [tab] = await browser.tabs.query({ active: true, currentWindow: true });
-      try {
-        const claimAmount = parseFloat(
-          aettosToAe(
-            await this.tipping.methods
-              .unclaimed_for_url(tab.url)
-              .then(r => r.decodedResult)
-              .catch(() => 0),
-          ),
-        );
-        if (!claimAmount) throw new Error(this.$t('pages.claim.noZeroClaim'));
-        await axios
-          .post(`${TIP_SERVICE}`, { url: tab.url, address: this.account.publicKey })
-          .catch(({ response }) => {
-            const { error } = response.data;
-            if (error.includes('MORE_ORACLES_NEEDED'))
-              throw new Error(this.$t('pages.claim.moreOracles'));
-            else if (error.includes('URL_NOT_EXISTING'))
-              throw new Error(this.$t('pages.claim.urlNotExisting'));
-            else if (error.includes('NO_ZERO_AMOUNT_PAYOUT'))
-              throw new Error(this.$t('pages.claim.noZeroClaim'));
-            else if (error.includes('ORACLE_SEVICE_CHECK_CLAIM_FAILED'))
-              throw new Error(this.$t('pages.claim.oracleFailed'));
-            else throw new Error(error);
-          });
-        await axios.post(`${BACKEND_URL}/cache/invalidate/tip`).catch();
-        await axios.post(`${BACKEND_URL}/cache/invalidate/oracle`).catch();
-        this.$emit('setLoading', false);
-        this.$store.dispatch('modals/open', { name: 'claim-success', url: tab.url, claimAmount });
-      } catch (e) {
-        const msg = e.message.replace('Error: ', '');
-        this.$emit('setLoading', false);
-        this.$store.dispatch('modals/open', { name: 'default', msg });
+      if (process.env.IS_EXTENSION) {
+        this.$emit('setLoading', true);
+        await this.$watchUntilTruly(() => this.sdk);
+        await this.$watchUntilTruly(() => this.tipping);
+        const [tab] = await browser.tabs.query({ active: true, currentWindow: true });
+        try {
+          const claimAmount = parseFloat(
+            aettosToAe(
+              await this.tipping.methods
+                .unclaimed_for_url(tab.url)
+                .then(r => r.decodedResult)
+                .catch(() => 1),
+            ),
+          );
+          if (!claimAmount) throw new Error(this.$t('pages.claim.noZeroClaim'));
+          await axios
+            .post(`${TIP_SERVICE}`, { url: tab.url, address: this.account.publicKey })
+            .catch(({ response }) => {
+              const { error = 'UNKNOWN_ERROR' } = response.data;
+              if (error.includes('MORE_ORACLES_NEEDED'))
+                throw new Error(this.$t('pages.claim.moreOracles'));
+              else if (error.includes('URL_NOT_EXISTING'))
+                throw new Error(this.$t('pages.claim.urlNotExisting'));
+              else if (error.includes('NO_ZERO_AMOUNT_PAYOUT'))
+                throw new Error(this.$t('pages.claim.noZeroClaim'));
+              else if (error.includes('ORACLE_SEVICE_CHECK_CLAIM_FAILED'))
+                throw new Error(this.$t('pages.claim.oracleFailed'));
+              else if (error.includes('UNKNOWN_ERROR'))
+                throw new Error(this.$t('pages.claim.unknownError'));
+              else throw new Error(error);
+            });
+          await axios.post(`${BACKEND_URL}/cache/invalidate/tip`).catch();
+          await axios.post(`${BACKEND_URL}/cache/invalidate/oracle`).catch();
+          this.$emit('setLoading', false);
+          this.$store.dispatch('modals/open', { name: 'claim-success', url: tab.url, claimAmount });
+        } catch (e) {
+          const msg = e.message.replace('Error: ', '');
+          this.$emit('setLoading', false);
+          this.$store.dispatch('modals/open', { name: 'default', msg });
+        }
+      } else {
+        this.$store.dispatch('modals/open', {
+          name: 'default',
+          msg: this.$t('pages.claim.noMobileClaim'),
+        });
       }
     },
   },
diff --git a/src/popup/router/components/Loader.vue b/src/popup/router/components/Loader.vue
index f251c837c..64ca6308d 100644
--- a/src/popup/router/components/Loader.vue
+++ b/src/popup/router/components/Loader.vue
@@ -7,10 +7,10 @@
         <ae-loader v-if="size == 'small'" />
       </div>
       <transition name="fadeOut" v-if="size == 'big'">
-        <span class="mainLoader mainLoaderTransparent" v-if="type == 'transparent'"
-          ><ae-loader
-        /></span>
-        <Welcome class="mainLoader" v-if="type !== 'transparent'" />
+        <span v-if="type == 'transparent'" class="main-loader main-loader-transparent">
+          <ae-loader />
+        </span>
+        <Welcome v-else class="main-loader main-loader-solid" />
       </transition>
     </div>
   </div>
@@ -48,15 +48,13 @@ export default {
   border-right-color: transparent !important;
 }
 
-.mainLoader {
+.main-loader {
   position: fixed;
   width: 100%;
   height: 100%;
   background-color: $bg-color;
   top: 0;
-  z-index: 6;
-  padding-top: 50px;
-  padding-top: calc(50px + env(safe-area-inset-top));
+  z-index: 8;
 
   .ae-loader {
     position: absolute;
@@ -68,9 +66,14 @@ export default {
     border-radius: 3em !important;
   }
 
-  &.mainLoaderTransparent {
+  &.main-loader-transparent {
     opacity: 0.6;
   }
+
+  &.main-loader-solid {
+    padding-top: 50px;
+    padding-top: calc(50px + env(safe-area-inset-top));
+  }
 }
 
 .loader .loading {
diff --git a/src/popup/router/components/TransactionItem.vue b/src/popup/router/components/TransactionItem.vue
index 62a7033ec..e8e84ce68 100644
--- a/src/popup/router/components/TransactionItem.vue
+++ b/src/popup/router/components/TransactionItem.vue
@@ -61,11 +61,12 @@ export default {
       return this.$t('pages.transactions.received');
     },
     txAmount() {
-      const amount = this.transaction.tx.amount ? this.transaction.tx.amount : 0;
-      return (+aettosToAe(amount)).toFixed(2);
+      const amount = this.transaction.tx.amount || this.transaction.tx.name_fee || 0;
+      const fee = this.transaction.tx.fee || 0;
+      return (+aettosToAe(amount + fee)).toFixed(2);
     },
     txAmountToCurrency() {
-      const amount = this.transaction.tx.amount ? this.transaction.tx.amount : 0;
+      const amount = this.transaction.tx.amount || this.transaction.tx.name_fee || 0;
       const fee = this.transaction.tx.fee || 0;
       const txamount = aettosToAe(amount + fee);
       return (txamount * this.current.currencyRate).toFixed(2);
diff --git a/src/popup/router/pages/Account.vue b/src/popup/router/pages/Account.vue
index 0661d56cc..e19076968 100644
--- a/src/popup/router/pages/Account.vue
+++ b/src/popup/router/pages/Account.vue
@@ -24,7 +24,7 @@
         >
           <Tip slot="icon" />
         </BoxButton>
-        <ClaimTips @setLoading="val => (loading = val)" v-if="IS_EXTENSION" />
+        <ClaimTips @setLoading="val => (loading = val)" />
         <BoxButton text="Activity" to="transactions" class="tour__step5">
           <Activity slot="icon" />
         </BoxButton>
@@ -76,7 +76,6 @@ export default {
     return {
       backup_seed_notif: false,
       loading: false,
-      IS_EXTENSION: process.env.IS_EXTENSION,
     };
   },
   computed: {
diff --git a/src/popup/router/pages/Receive.vue b/src/popup/router/pages/Receive.vue
index f2cc76348..ded46926c 100644
--- a/src/popup/router/pages/Receive.vue
+++ b/src/popup/router/pages/Receive.vue
@@ -35,7 +35,7 @@ export default {
   data() {
     return {
       jellySwapUrl: 'https://app.jelly.market',
-      changellyUrl: 'https://changelly.com/processing',
+      changellyUrl: 'https://changelly.com/buy',
     };
   },
   computed: {
diff --git a/src/popup/router/pages/Retip.vue b/src/popup/router/pages/Retip.vue
index 9cd06ba26..4983fda70 100644
--- a/src/popup/router/pages/Retip.vue
+++ b/src/popup/router/pages/Retip.vue
@@ -6,7 +6,7 @@
         <span class="secondary-text">{{ $t('pages.appVUE.aeid') }}</span>
         {{ $t('pages.tipPage.to') }}
       </div>
-      <UrlBadge :type="urlVerified ? 'verified' : 'not-verified'" />
+      <UrlBadge v-if="tip.url" :type="urlVerified ? 'verified' : 'not-verified'" />
     </div>
 
     <div class="url-bar">
@@ -67,10 +67,11 @@ export default {
       return calculatedMaxValue > 0 ? calculatedMaxValue.toString() : 0;
     },
     urlVerified() {
-      const twitterProfile = getTwitterAccountUrl(this.url);
+      if (!this.tip.url) return false;
+      const twitterProfile = getTwitterAccountUrl(this.tip.url);
       return (
-        this.url &&
-        (this.verifiedUrls.includes(this.url) ||
+        this.tip.url &&
+        (this.verifiedUrls.includes(this.tip.url) ||
           (twitterProfile && this.verifiedUrls.includes(twitterProfile)))
       );
     },
@@ -87,6 +88,7 @@ export default {
     this.loading = true;
     this.verifiedUrls = (await axios.get(`${BACKEND_URL}/verified`)).data;
     await this.$watchUntilTruly(() => this.sdk);
+    await this.$watchUntilTruly(() => this.tippingAddress);
     this.minCallFee = calculateFee(TX_TYPES.contractCall, {
       ...this.sdk.Ae.defaults,
       contractId: this.tippingAddress,
diff --git a/src/popup/router/pages/TipPage.vue b/src/popup/router/pages/TipPage.vue
index ae705029d..fa0ba33b4 100644
--- a/src/popup/router/pages/TipPage.vue
+++ b/src/popup/router/pages/TipPage.vue
@@ -6,7 +6,7 @@
           <div>
             {{ $t('pages.tipPage.url') }}
           </div>
-          <UrlBadge @click.native="showBadgeModal" :type="verifiedStatus" />
+          <UrlBadge v-if="url" @click.native="showBadgeModal" :type="verifiedStatus" />
         </template>
         <template v-else>
           {{ $t('pages.tipPage.headingSending') }}
@@ -23,10 +23,15 @@
             {{ url }}
           </a>
         </template>
-        <Input v-else size="m-0 xsm" v-model="url" />
-        <button v-if="!confirmMode" @click="editUrl = !editUrl" data-cy="edit-url">
-          <ae-icon name="check" data-cy="confirm-url" v-if="editUrl" />
-          <EditIcon data-cy="confirm-url" v-else />
+        <Input
+          v-else
+          size="m-0 xsm"
+          v-model="url"
+          :error="url && !validUrl"
+          :placeholder="$t('pages.tipPage.enterUrl')"
+        />
+        <button v-if="!confirmMode && !editUrl" @click="editUrl = !editUrl" data-cy="edit-url">
+          <EditIcon v-if="!editUrl" data-cy="confirm-url" />
         </button>
       </div>
     </div>
@@ -41,7 +46,7 @@
         <Button
           class="send-tip-button"
           @click="toConfirm"
-          :disabled="!note || amountError || noteError || !minCallFee || editUrl"
+          :disabled="!note || amountError || noteError || !minCallFee || !validUrl || !url"
           data-cy="send-tip"
         >
           {{ $t('pages.tipPage.next') }}
@@ -68,7 +73,12 @@
 import { mapGetters, mapState } from 'vuex';
 import axios from 'axios';
 import { calculateFee, TX_TYPES, BACKEND_URL } from '../../utils/constants';
-import { escapeSpecialChars, aeToAettos, getTwitterAccountUrl } from '../../utils/helper';
+import {
+  escapeSpecialChars,
+  aeToAettos,
+  getTwitterAccountUrl,
+  validateUrl,
+} from '../../utils/helper';
 import EditIcon from '../../../icons/edit-icon.svg?vue-component';
 import AmountSend from '../components/AmountSend';
 import Textarea from '../components/Textarea';
@@ -130,6 +140,9 @@ export default {
     verifiedStatus() {
       return this.urlVerified || this.tourRunning ? 'verified' : 'not-verified';
     },
+    validUrl() {
+      return validateUrl(this.url);
+    },
   },
   watch: {
     amount() {
@@ -165,6 +178,7 @@ export default {
       console.error(`Can't fetch /verified: ${e}`);
     }
     await this.$watchUntilTruly(() => this.sdk);
+    await this.$watchUntilTruly(() => this.tippingAddress);
     this.minCallFee = calculateFee(TX_TYPES.contractCall, {
       ...this.sdk.Ae.defaults,
       contractId: this.tippingAddress,
@@ -197,18 +211,17 @@ export default {
       );
     },
     async toConfirm() {
-      if (!this.urlVerified) {
-        const allowToConfirm = await this.$store
-          .dispatch('modals/open', { name: 'confirm-tip' })
-          .catch(() => false);
-        if (!allowToConfirm) {
-          return;
-        }
-      }
+      // TODO: check if url cannot be claimed through backend and only then show confirm modal
+      // if (!this.urlVerified) {
+      //   const allowToConfirm = await this.$store
+      //     .dispatch('modals/open', { name: 'confirm-tip' })
+      //     .catch(() => false);
+      //   if (!allowToConfirm) return;
+      // }
       this.amountError = !this.amount || !this.minCallFee || this.maxValue - this.amount <= 0;
       this.amountError = this.amountError || !+this.amount || this.amount <= 0;
       this.noteError = !this.note || !this.url;
-      this.confirmMode = !this.amountError && !this.noteError;
+      this.confirmMode = !this.amountError && !this.noteError && this.validUrl && this.url;
     },
     async sendTip() {
       const amount = aeToAettos(this.amount);
diff --git a/src/popup/utils/helper.js b/src/popup/utils/helper.js
index 542d9e51d..189dfca8a 100644
--- a/src/popup/utils/helper.js
+++ b/src/popup/utils/helper.js
@@ -47,6 +47,11 @@ const convertToAE = balance => +(balance / 10 ** 18).toFixed(7);
 
 const extractHostName = url => new URL(url.includes('://') ? url : `http://${url}`).hostname;
 
+export const validateUrl = url => {
+  const urlRegex = /(https?:\/\/)?([\w-])+\.{1}([a-zA-Z]{2,63})([/\w-]*)*\/?\??([^#\n\r]*)?#?([^\n\r]*)/g;
+  return urlRegex.test(url);
+};
+
 const detectBrowser = () => {
   if ((navigator.userAgent.indexOf('Opera') || navigator.userAgent.indexOf('OPR')) !== -1) {
     return 'Opera';

From 83cecbbc14a7341518b042ed7cf9de6834f7d3e8 Mon Sep 17 00:00:00 2001
From: Petar Baykov <petbaik26@gmail.com>
Date: Tue, 21 Apr 2020 16:52:47 +0300
Subject: [PATCH 02/14] Adjust tests to changes in send tip page

---
 src/popup/router/pages/TipPage.vue |  1 +
 tests/e2e/integration/tip.js       |  8 ++++----
 tests/e2e/support/commands.js      | 22 ++++------------------
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/popup/router/pages/TipPage.vue b/src/popup/router/pages/TipPage.vue
index fa0ba33b4..617e16621 100644
--- a/src/popup/router/pages/TipPage.vue
+++ b/src/popup/router/pages/TipPage.vue
@@ -222,6 +222,7 @@ export default {
       this.amountError = this.amountError || !+this.amount || this.amount <= 0;
       this.noteError = !this.note || !this.url;
       this.confirmMode = !this.amountError && !this.noteError && this.validUrl && this.url;
+      if (this.confirmMode) this.editUrl = false;
     },
     async sendTip() {
       const amount = aeToAettos(this.amount);
diff --git a/tests/e2e/integration/tip.js b/tests/e2e/integration/tip.js
index fbebd0882..62a0e6929 100644
--- a/tests/e2e/integration/tip.js
+++ b/tests/e2e/integration/tip.js
@@ -1,5 +1,5 @@
-const tip = { amount: 0.01, note: '#test', url: 'localhost:500' };
-const tip2 = { amount: 0.01, note: '#test1234', url: 'localhost:500', onTip: true };
+const tip = { amount: 0.01, note: '#test', url: 'example.com', edit: true };
+const tip2 = { amount: 0.01, note: '#test1234', url: 'example.com', onTip: true, edit: true };
 
 describe('Test cases for tip page', () => {
   beforeEach(() => {
@@ -35,7 +35,7 @@ describe('Test cases for tip page', () => {
   it('Validate tip details', () => {
     cy.openTip()
       .buttonShouldBeDisabled('[data-cy=send-tip]')
-      .enterTipDetails({ url: tip.url })
+      .enterTipDetails({ url: tip.url, edit: true })
       .buttonShouldBeDisabled('[data-cy=send-tip]')
       .enterTipDetails({ amount: tip.amount })
       .buttonShouldBeDisabled('[data-cy=send-tip]')
@@ -49,7 +49,7 @@ describe('Test cases for tip page', () => {
       .buttonShouldBeDisabled('[data-cy=send-tip]')
       .enterTipDetails({ amount: 0, note: tip.note })
       .buttonShouldBeDisabled('[data-cy=send-tip]')
-      .enterTipDetails({ ...tip })
+      .enterTipDetails({ ...tip, edit: false })
       .buttonShouldNotBeDisabled('[data-cy=send-tip]');
   });
 
diff --git a/tests/e2e/support/commands.js b/tests/e2e/support/commands.js
index d314d1648..3f4263075 100644
--- a/tests/e2e/support/commands.js
+++ b/tests/e2e/support/commands.js
@@ -182,7 +182,7 @@ Cypress.Commands.add('openWithdraw', () => {
     .click();
 });
 
-Cypress.Commands.add('enterTipDetails', ({ url = '', amount = null, note = '' }) => {
+Cypress.Commands.add('enterTipDetails', ({ url = '', amount = null, note = '', edit = false }) => {
   cy.get('[data-cy=input-number]').clear();
   if (amount || amount === 0) {
     cy.get('[data-cy=input-number]').type(amount);
@@ -191,14 +191,11 @@ Cypress.Commands.add('enterTipDetails', ({ url = '', amount = null, note = '' })
   cy.get('[data-cy=textarea]').clear();
   if (note) cy.get('[data-cy=textarea]').type(note);
 
+  if (edit) cy.get('[data-cy=edit-url]').click();
   if (url) {
-    cy.get('[data-cy=edit-url]')
-      .click()
-      .get('[data-cy=input]')
+    cy.get('[data-cy=input]')
       .clear()
-      .type(url)
-      .get('[data-cy=confirm-url]')
-      .click();
+      .type(url);
   }
 });
 
@@ -208,17 +205,6 @@ Cypress.Commands.add('toConfirmTip', (tip = {}) => {
     .buttonShouldNotBeDisabled('[data-cy=send-tip]')
     .get('[data-cy=send-tip]')
     .click()
-    .get('.confirmtip-modal--footer')
-    .should('be.visible')
-    .get('[data-cy=cancel-tip]')
-    .click()
-    .wait(1000)
-    .get('[data-cy=send-tip]')
-    .click()
-    .get('.confirmtip-modal--footer')
-    .should('be.visible')
-    .get('[data-cy=to-confirm]')
-    .click()
     .get('[data-cy=confirm-tip]')
     .should('be.visible')
     .buttonShouldNotBeDisabled('[data-cy=confirm-tip]')

From a1e911f1c9454334181e2b37b62edccb83141ea0 Mon Sep 17 00:00:00 2001
From: Petar Baykov <petbaik26@gmail.com>
Date: Thu, 23 Apr 2020 13:12:12 +0300
Subject: [PATCH 03/14] Allow tips with value > 0.01 USD

Fixes #179
---
 src/popup/router/pages/TipPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/popup/router/pages/TipPage.vue b/src/popup/router/pages/TipPage.vue
index 617e16621..6e1057b4e 100644
--- a/src/popup/router/pages/TipPage.vue
+++ b/src/popup/router/pages/TipPage.vue
@@ -146,7 +146,7 @@ export default {
   },
   watch: {
     amount() {
-      this.amountError = !+this.amount || this.amount <= 0;
+      this.amountError = !+this.amount || this.amount < 0.1;
     },
     $route: {
       immediate: true,

From 8bff064968f883b8490281c2258cf96b0eef1638 Mon Sep 17 00:00:00 2001
From: Petar Baykov <petbaik26@gmail.com>
Date: Thu, 23 Apr 2020 13:15:54 +0300
Subject: [PATCH 04/14] Check for min tip amount in retip page

---
 src/popup/router/pages/Retip.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/popup/router/pages/Retip.vue b/src/popup/router/pages/Retip.vue
index 4983fda70..50f17ee22 100644
--- a/src/popup/router/pages/Retip.vue
+++ b/src/popup/router/pages/Retip.vue
@@ -81,7 +81,7 @@ export default {
   },
   watch: {
     amount() {
-      this.amountError = false;
+      this.amountError = !+this.amount || this.amount < 0.1;
     },
   },
   async created() {

From e1bedba85c388d0b1ffd28c9196bb05188a03e1e Mon Sep 17 00:00:00 2001
From: Petar Baykov <petbaik26@gmail.com>
Date: Thu, 23 Apr 2020 15:04:18 +0300
Subject: [PATCH 05/14] Extract MIN_TIP_AMOUNT constant

---
 src/popup/router/pages/Retip.vue   | 12 +++++++++---
 src/popup/router/pages/TipPage.vue |  6 +++---
 src/popup/utils/constants.js       |  2 ++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/popup/router/pages/Retip.vue b/src/popup/router/pages/Retip.vue
index 50f17ee22..7d9cd9899 100644
--- a/src/popup/router/pages/Retip.vue
+++ b/src/popup/router/pages/Retip.vue
@@ -34,7 +34,13 @@ import { mapGetters, mapState } from 'vuex';
 import BigNumber from 'bignumber.js';
 import axios from 'axios';
 import tipping from 'aepp-raendom/src/utils/tippingContractUtil';
-import { MAGNITUDE, calculateFee, TX_TYPES, BACKEND_URL } from '../../utils/constants';
+import {
+  MAGNITUDE,
+  calculateFee,
+  TX_TYPES,
+  BACKEND_URL,
+  MIN_TIP_AMOUNT,
+} from '../../utils/constants';
 import { getTwitterAccountUrl } from '../../utils/helper';
 import openUrl from '../../utils/openUrl';
 import AmountSend from '../components/AmountSend';
@@ -81,7 +87,7 @@ export default {
   },
   watch: {
     amount() {
-      this.amountError = !+this.amount || this.amount < 0.1;
+      this.amountError = !+this.amount || this.amount < MIN_TIP_AMOUNT;
     },
   },
   async created() {
@@ -109,7 +115,7 @@ export default {
     },
     async sendTip() {
       this.amountError = !this.amount || !this.minCallFee || this.maxValue - this.amount <= 0;
-      this.amountError = this.amountError || !+this.amount || this.amount <= 0;
+      this.amountError = this.amountError || !+this.amount || this.amount < MIN_TIP_AMOUNT;
       if (this.amountError) return;
       const amount = BigNumber(this.amount).shiftedBy(MAGNITUDE);
       this.loading = true;
diff --git a/src/popup/router/pages/TipPage.vue b/src/popup/router/pages/TipPage.vue
index 6e1057b4e..55a66fcae 100644
--- a/src/popup/router/pages/TipPage.vue
+++ b/src/popup/router/pages/TipPage.vue
@@ -72,7 +72,7 @@
 <script>
 import { mapGetters, mapState } from 'vuex';
 import axios from 'axios';
-import { calculateFee, TX_TYPES, BACKEND_URL } from '../../utils/constants';
+import { calculateFee, TX_TYPES, BACKEND_URL, MIN_TIP_AMOUNT } from '../../utils/constants';
 import {
   escapeSpecialChars,
   aeToAettos,
@@ -146,7 +146,7 @@ export default {
   },
   watch: {
     amount() {
-      this.amountError = !+this.amount || this.amount < 0.1;
+      this.amountError = !+this.amount || this.amount < MIN_TIP_AMOUNT;
     },
     $route: {
       immediate: true,
@@ -219,7 +219,7 @@ export default {
       //   if (!allowToConfirm) return;
       // }
       this.amountError = !this.amount || !this.minCallFee || this.maxValue - this.amount <= 0;
-      this.amountError = this.amountError || !+this.amount || this.amount <= 0;
+      this.amountError = this.amountError || !+this.amount || this.amount < MIN_TIP_AMOUNT;
       this.noteError = !this.note || !this.url;
       this.confirmMode = !this.amountError && !this.noteError && this.validUrl && this.url;
       if (this.confirmMode) this.editUrl = false;
diff --git a/src/popup/utils/constants.js b/src/popup/utils/constants.js
index 71351b22d..b0d899e67 100644
--- a/src/popup/utils/constants.js
+++ b/src/popup/utils/constants.js
@@ -181,3 +181,5 @@ export const IDENTICON_SIZES = {
   normal: 38,
   lg: 64,
 };
+
+export const MIN_TIP_AMOUNT = !process.env.RUNNING_IN_TESTS ? 0.1 : 0.001;

From 30355c8dbc93d8beb9c3b5c220393412939e50d7 Mon Sep 17 00:00:00 2001
From: Petar Baykov <petbaik26@gmail.com>
Date: Thu, 23 Apr 2020 16:53:38 +0300
Subject: [PATCH 06/14] Remove account

Fixes #176
---
 src/popup/App.vue                             |  8 +-
 src/popup/locales/en.json                     | 11 ++-
 src/popup/router/components/Modal.vue         | 28 ++++--
 .../router/components/Modals/ConfirmModal.vue | 37 +++++++
 .../router/components/Modals/ConfirmTip.vue   | 31 ++----
 src/popup/router/components/SidebarMenu.vue   | 30 +++++-
 src/popup/router/modals.js                    |  2 +
 src/popup/router/routes.js                    |  2 +
 src/store/index.js                            | 97 ++++++++++---------
 src/store/plugins/persistState.js             | 10 +-
 10 files changed, 167 insertions(+), 89 deletions(-)
 create mode 100644 src/popup/router/components/Modals/ConfirmModal.vue

diff --git a/src/popup/App.vue b/src/popup/App.vue
index 3b051e3a0..1c8650dc1 100644
--- a/src/popup/App.vue
+++ b/src/popup/App.vue
@@ -115,15 +115,11 @@ export default {
       this.pollData();
     },
     pollData() {
-      let triggerOnce = false;
       const polling = setInterval(async () => {
         if (!this.isLoggedIn) return;
-        if (!process.env.RUNNING_IN_TESTS) this.$store.dispatch('updateBalance');
-        if (!triggerOnce) {
-          this.$store.dispatch('getRegisteredNames');
-          triggerOnce = true;
-        }
+        if (!process.env.RUNNING_IN_TESTS && this.sdk) this.$store.dispatch('updateBalance');
       }, 2500);
+      this.$store.dispatch('getRegisteredNames');
       this.$once('hook:beforeDestroy', () => clearInterval(polling));
     },
   },
diff --git a/src/popup/locales/en.json b/src/popup/locales/en.json
index bc6294c05..deceab914 100644
--- a/src/popup/locales/en.json
+++ b/src/popup/locales/en.json
@@ -65,7 +65,13 @@
     },
     "insufficient-balance": {
       "msg": "The requested amount cannot be spent."
-    }
+    },
+    "removeAccount": {
+      "title": "Are you sure you want to remove this account?",
+      "msg": "This action cannot be undone"
+    },
+    "cancel": "Cancel",
+    "confirm": "Confirm"
   },
   "pages": {
     "intro": {
@@ -137,7 +143,8 @@
       "mainAccount": "Main account",
       "reportBug": "Report a bug",
       "names": "Names",
-      "networks": "Networks"
+      "networks": "Networks",
+      "removeAccount": "Remove account"
     },
     "aboutSettings": {
       "heading": "About",
diff --git a/src/popup/router/components/Modal.vue b/src/popup/router/components/Modal.vue
index 4a4b6dc7a..dd93bef94 100644
--- a/src/popup/router/components/Modal.vue
+++ b/src/popup/router/components/Modal.vue
@@ -5,13 +5,13 @@
         <div class="modal--wrapper">
           <div class="modal--container">
             <Close class="modal--close" @click="$emit('close')" />
-            <div class="modal--header">
+            <div v-if="$slots.header" class="modal--header">
               <slot name="header" />
             </div>
-            <div class="modal--body">
+            <div v-if="$slots.body" class="modal--body">
               <slot name="body" />
             </div>
-            <div class="modal--footer">
+            <div v-if="$slots.footer" class="modal--footer">
               <slot name="footer" />
             </div>
           </div>
@@ -38,7 +38,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 @import '../../../common/variables';
 .modal--mask {
   position: fixed;
@@ -72,15 +72,31 @@ export default {
   }
   .modal--header {
     color: $white-color;
-    font-size: 16px;
+    font-size: 17px;
+    font-weight: 500;
+    margin-bottom: 25px;
+    word-break: break-word;
   }
   .modal--body {
-    margin: 20px 0;
+    margin-bottom: 40px;
     color: $text-color;
     font-size: 14px;
     word-break: break-word;
     text-align: left;
   }
+
+  .modal--footer {
+    .modal-confirm-btns {
+      display: flex;
+      justify-content: space-between;
+      button {
+        margin: 0 !important;
+        width: 120px !important;
+        font-weight: 700 !important;
+      }
+    }
+  }
+
   .modal--enter {
     opacity: 0;
   }
diff --git a/src/popup/router/components/Modals/ConfirmModal.vue b/src/popup/router/components/Modals/ConfirmModal.vue
new file mode 100644
index 000000000..8ae1f39d4
--- /dev/null
+++ b/src/popup/router/components/Modals/ConfirmModal.vue
@@ -0,0 +1,37 @@
+<template>
+  <Modal @close="resolve">
+    <template v-if="title" slot="header">{{ title }}</template>
+    <template v-if="msg" slot="body"> {{ msg }} </template>
+    <div class="modal-confirm-btns" slot="footer">
+      <Button data-cy="cancel-tip" dark @click="cancel">
+        {{ $t('modals.cancel') }}
+      </Button>
+      <Button data-cy="to-confirm" @click="confirm">
+        {{ $t('modals.confirm') }}
+      </Button>
+    </div>
+  </Modal>
+</template>
+
+<script>
+import Modal from '../Modal';
+import Button from '../Button';
+
+export default {
+  props: {
+    resolve: { type: Function, required: true },
+    reject: { type: Function, required: true },
+    title: { type: String, required: false },
+    msg: { type: String, required: false },
+  },
+  components: { Modal, Button },
+  methods: {
+    confirm() {
+      this.resolve(true);
+    },
+    cancel() {
+      this.reject(new Error('reject'));
+    },
+  },
+};
+</script>
diff --git a/src/popup/router/components/Modals/ConfirmTip.vue b/src/popup/router/components/Modals/ConfirmTip.vue
index 59f17a352..984a6df0b 100644
--- a/src/popup/router/components/Modals/ConfirmTip.vue
+++ b/src/popup/router/components/Modals/ConfirmTip.vue
@@ -1,13 +1,13 @@
 <template>
   <Modal @close="resolve">
-    <h4 class="confirmtip-modal-header" slot="header">
+    <template slot="header">
       {{ $t('pages.tipPage.sendTipConfirmationHeader') }}
-    </h4>
-    <div class="confirmtip-modal--body" slot="body">
+    </template>
+    <template slot="body">
       {{ $t('pages.tipPage.sendTipConfirmationBody') }}
       <p class="confirmation--question">{{ $t('pages.tipPage.sendTipConfirmationQstn') }}</p>
-    </div>
-    <div class="confirmtip-modal--footer" slot="footer">
+    </template>
+    <div class="modal-confirm-btns" slot="footer">
       <Button data-cy="cancel-tip" dark @click="cancelTip">
         {{ $t('pages.tipPage.cancel') }}
       </Button>
@@ -40,25 +40,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.confirmtip-modal-header {
-  margin: 0 !important;
+.confirmation--question {
   font-weight: 500 !important;
-}
-.confirmtip-modal--body {
-  padding-bottom: 20px;
-  .confirmation--question {
-    font-weight: 500 !important;
-    color: #fff !important;
-  }
-}
-.confirmtip-modal--footer {
-  display: flex;
-  justify-content: space-between;
-  button {
-    margin: 0 !important;
-    width: 120px !important;
-    font-weight: 700 !important;
-    font-size: 15px !important;
-  }
+  color: #fff !important;
 }
 </style>
diff --git a/src/popup/router/components/SidebarMenu.vue b/src/popup/router/components/SidebarMenu.vue
index 7625e4376..02daa68e1 100644
--- a/src/popup/router/components/SidebarMenu.vue
+++ b/src/popup/router/components/SidebarMenu.vue
@@ -65,6 +65,11 @@
               {{ $t('pages.appVUE.networks') }}
             </router-link>
           </li>
+          <li>
+            <span data-cy="remove-account" @click="removeAccount">
+              {{ $t('pages.appVUE.removeAccount') }}
+            </span>
+          </li>
         </ul>
       </transition>
     </li>
@@ -97,6 +102,8 @@ import { mapGetters } from 'vuex';
 import Close from '../../../icons/close.svg?vue-component';
 import Arrow from '../../../icons/arrow-current-color.svg?vue-component';
 import UserAvatar from './UserAvatar';
+import { AEX2_METHODS } from '../../utils/constants';
+import { postMessage } from '../../utils/connection';
 
 export default {
   components: { Close, Arrow, UserAvatar },
@@ -109,6 +116,22 @@ export default {
     closeMenu() {
       this.$emit('closeMenu');
     },
+    async removeAccount() {
+      const remove = await this.$store
+        .dispatch('modals/open', {
+          name: 'confirm',
+          title: this.$t('modals.removeAccount.title'),
+          msg: this.$t('modals.removeAccount.msg'),
+        })
+        .catch(() => false);
+      if (remove) {
+        this.$emit('closeMenu');
+        await this.$store.dispatch('reset');
+        await this.$router.push('/');
+        this.$store.commit('SET_MAIN_LOADING', false);
+        postMessage({ type: AEX2_METHODS.LOGOUT });
+      }
+    },
   },
 };
 </script>
@@ -133,7 +156,8 @@ export default {
     border-bottom: 1px solid $bg-color;
 
     a,
-    button {
+    button,
+    span {
       text-decoration: none;
       display: flex;
       justify-content: space-between;
@@ -146,6 +170,7 @@ export default {
       padding: 8px 1rem;
       white-space: nowrap;
       transition: background-color 0.2s;
+      cursor: pointer;
 
       &.opened,
       &:hover {
@@ -180,7 +205,8 @@ export default {
       }
 
       a,
-      button {
+      button,
+      span {
         padding: 6px 1rem 6px 25px;
       }
     }
diff --git a/src/popup/router/modals.js b/src/popup/router/modals.js
index 44ed769d5..8581d97b2 100644
--- a/src/popup/router/modals.js
+++ b/src/popup/router/modals.js
@@ -3,10 +3,12 @@ import DefaultModal from './components/Modals/DefaultModal';
 import ClaimSuccessModal from './components/Modals/ClaimSuccessModal';
 import TipBadgeModal from './components/Modals/TipBadgeModal';
 import ConfirmTip from './components/Modals/ConfirmTip';
+import ConfirmModal from './components/Modals/ConfirmModal';
 
 export default async () => {
   registerModal({ name: 'default', component: DefaultModal });
   registerModal({ name: 'claim-success', component: ClaimSuccessModal });
   registerModal({ name: 'tip-badge', component: TipBadgeModal });
   registerModal({ name: 'confirm-tip', component: ConfirmTip });
+  registerModal({ name: 'confirm', component: ConfirmModal });
 };
diff --git a/src/popup/router/routes.js b/src/popup/router/routes.js
index 76f2ed915..7c3e7ebda 100644
--- a/src/popup/router/routes.js
+++ b/src/popup/router/routes.js
@@ -128,6 +128,7 @@ export default [
     component: Retip,
     meta: {
       title: 'send',
+      notPersist: true,
     },
   },
   {
@@ -243,6 +244,7 @@ export default [
     component: CommentNew,
     meta: {
       title: 'comment-new',
+      notPersist: true,
     },
   },
   {
diff --git a/src/store/index.js b/src/store/index.js
index 5bead5b44..25cb6e5fe 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -11,52 +11,54 @@ import { networks, DEFAULT_NETWORK } from '../popup/utils/constants';
 
 Vue.use(Vuex);
 
-export default new Vuex.Store({
-  state: {
-    isRestored: false,
-    subaccounts: [],
-    account: {},
-    mnemonic: null,
-    activeAccount: 0,
-    names: [],
-    wallet: [],
-    balance: 0,
-    current: {
-      network: DEFAULT_NETWORK,
-      language: 'en',
-      token: 0,
-      currency: 'usd',
-      currencyRate: 0,
-    },
-    network: networks,
-    userNetworks: [],
-    isLoggedIn: false,
-    transactions: {
-      latest: [],
-      pending: [],
-    },
-    sdk: null,
-    middleware: null,
-    aeppPopup: false,
-    ledgerApi: null,
-    txAdvancedMode: false,
-    tipping: null,
-    tippingReceiver: {},
-    tippingAddress: null,
-    mainLoading: true,
-    nodeStatus: 'connecting',
-    currencies: {},
-    nextCurrenciesFetch: null,
-    notifications: [],
-    notificationsCounter: null,
-    tip: null,
-    txQueue: [],
-    connectedAepps: {},
-    migrations: {},
-    backedUpSeed: null,
-    tourRunning: false,
-    tourStartBar: true,
+const initialState = {
+  isRestored: false,
+  subaccounts: [],
+  account: {},
+  mnemonic: null,
+  activeAccount: 0,
+  names: [],
+  wallet: [],
+  balance: 0,
+  current: {
+    network: DEFAULT_NETWORK,
+    language: 'en',
+    token: 0,
+    currency: 'usd',
+    currencyRate: 0,
   },
+  network: networks,
+  userNetworks: [],
+  isLoggedIn: false,
+  transactions: {
+    latest: [],
+    pending: [],
+  },
+  sdk: null,
+  middleware: null,
+  aeppPopup: false,
+  ledgerApi: null,
+  txAdvancedMode: false,
+  tipping: null,
+  tippingReceiver: {},
+  tippingAddress: null,
+  mainLoading: true,
+  nodeStatus: 'connecting',
+  currencies: {},
+  nextCurrenciesFetch: null,
+  notifications: [],
+  notificationsCounter: null,
+  tip: null,
+  txQueue: [],
+  connectedAepps: {},
+  migrations: {},
+  backedUpSeed: null,
+  tourRunning: false,
+  tourStartBar: true,
+};
+
+export default new Vuex.Store({
+  state: { ...initialState },
   getters,
   mutations: {
     syncState(state, remoteState) {
@@ -74,6 +76,11 @@ export default new Vuex.Store({
     markMigrationAsApplied(state, migrationId) {
       Vue.set(state.migrations, migrationId, true);
     },
+    resetState(state, remoteState) {
+      Object.entries(mergeWith({}, initialState, remoteState)).forEach(([name, value]) =>
+        Vue.set(state, name, value),
+      );
+    },
     ...mutations,
   },
   actions,
diff --git a/src/store/plugins/persistState.js b/src/store/plugins/persistState.js
index 4f3594272..f359bfbe9 100644
--- a/src/store/plugins/persistState.js
+++ b/src/store/plugins/persistState.js
@@ -11,8 +11,8 @@ export const getState = async () => {
   return state || {};
 };
 
-export const resetState = () => {
-  browser.storage.remove.local(KEY);
+export const resetState = async () => {
+  await browser.storage.local.remove(KEY);
 };
 
 export default (reducerLoad, reducerSave) => async store => {
@@ -25,9 +25,11 @@ export default (reducerLoad, reducerSave) => async store => {
   });
   store.registerModule('persistState', {
     actions: {
-      reset() {
+      async reset() {
         resetting = true;
-        resetState();
+        await resetState();
+        resetting = false;
+        store.commit('resetState', { isRestored: true });
       },
     },
   });

From 1e924c7c734a8cf7fa76feb6a7850202c824fddb Mon Sep 17 00:00:00 2001
From: Milen Radkov <milenradkov@me.com>
Date: Thu, 23 Apr 2020 17:23:21 +0300
Subject: [PATCH 07/14] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dbe861a0c..22b1f3f19 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
 
 **SuperHero is a browser extension that allows you to send and recieve value to URLs and content accross Internet.**
 
-[![Build Status](https://travis-ci.com/aeternity/superhero-wallet.svg?branch=master)](https://travis-ci.com/aeternity/superhero-wallet) 
+[![Build Status](https://travis-ci.com/aeternity/superhero-wallet.svg?branch=develop)](https://travis-ci.com/aeternity/superhero-wallet)
+
 ## Build
 
 Clone the master branch of this repo.

From 39887565da87e24d058e5edae47c66e006cb8666 Mon Sep 17 00:00:00 2001
From: Petar Baykov <petbaik26@gmail.com>
Date: Thu, 23 Apr 2020 17:56:55 +0300
Subject: [PATCH 08/14] Min tip amount based on USD rate

---
 src/popup/router/pages/Retip.vue   | 14 ++++----------
 src/popup/router/pages/TipPage.vue |  8 ++++----
 src/popup/utils/constants.js       |  1 -
 src/store/actions.js               |  2 ++
 src/store/index.js                 |  3 +++
 src/store/mutations.js             |  3 +++
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/popup/router/pages/Retip.vue b/src/popup/router/pages/Retip.vue
index 7d9cd9899..a5fe94e62 100644
--- a/src/popup/router/pages/Retip.vue
+++ b/src/popup/router/pages/Retip.vue
@@ -34,13 +34,7 @@ import { mapGetters, mapState } from 'vuex';
 import BigNumber from 'bignumber.js';
 import axios from 'axios';
 import tipping from 'aepp-raendom/src/utils/tippingContractUtil';
-import {
-  MAGNITUDE,
-  calculateFee,
-  TX_TYPES,
-  BACKEND_URL,
-  MIN_TIP_AMOUNT,
-} from '../../utils/constants';
+import { MAGNITUDE, calculateFee, TX_TYPES, BACKEND_URL } from '../../utils/constants';
 import { getTwitterAccountUrl } from '../../utils/helper';
 import openUrl from '../../utils/openUrl';
 import AmountSend from '../components/AmountSend';
@@ -67,7 +61,7 @@ export default {
       'network',
       'currentCurrency',
     ]),
-    ...mapState(['tippingAddress']),
+    ...mapState(['tippingAddress', 'minTipAmount']),
     maxValue() {
       const calculatedMaxValue = this.balance - this.minCallFee;
       return calculatedMaxValue > 0 ? calculatedMaxValue.toString() : 0;
@@ -87,7 +81,7 @@ export default {
   },
   watch: {
     amount() {
-      this.amountError = !+this.amount || this.amount < MIN_TIP_AMOUNT;
+      this.amountError = !+this.amount || this.amount < this.minTipAmount;
     },
   },
   async created() {
@@ -115,7 +109,7 @@ export default {
     },
     async sendTip() {
       this.amountError = !this.amount || !this.minCallFee || this.maxValue - this.amount <= 0;
-      this.amountError = this.amountError || !+this.amount || this.amount < MIN_TIP_AMOUNT;
+      this.amountError = this.amountError || !+this.amount || this.amount < this.minTipAmount;
       if (this.amountError) return;
       const amount = BigNumber(this.amount).shiftedBy(MAGNITUDE);
       this.loading = true;
diff --git a/src/popup/router/pages/TipPage.vue b/src/popup/router/pages/TipPage.vue
index 55a66fcae..5fd0fee93 100644
--- a/src/popup/router/pages/TipPage.vue
+++ b/src/popup/router/pages/TipPage.vue
@@ -72,7 +72,7 @@
 <script>
 import { mapGetters, mapState } from 'vuex';
 import axios from 'axios';
-import { calculateFee, TX_TYPES, BACKEND_URL, MIN_TIP_AMOUNT } from '../../utils/constants';
+import { calculateFee, TX_TYPES, BACKEND_URL } from '../../utils/constants';
 import {
   escapeSpecialChars,
   aeToAettos,
@@ -121,7 +121,7 @@ export default {
       'currentCurrency',
       'tip',
     ]),
-    ...mapState(['tourRunning', 'tippingAddress']),
+    ...mapState(['tourRunning', 'tippingAddress', 'minTipAmount']),
     maxValue() {
       const calculatedMaxValue = this.balance - this.minCallFee;
       return calculatedMaxValue > 0 ? calculatedMaxValue.toString() : 0;
@@ -146,7 +146,7 @@ export default {
   },
   watch: {
     amount() {
-      this.amountError = !+this.amount || this.amount < MIN_TIP_AMOUNT;
+      this.amountError = !+this.amount || this.amount < this.minTipAmount;
     },
     $route: {
       immediate: true,
@@ -219,7 +219,7 @@ export default {
       //   if (!allowToConfirm) return;
       // }
       this.amountError = !this.amount || !this.minCallFee || this.maxValue - this.amount <= 0;
-      this.amountError = this.amountError || !+this.amount || this.amount < MIN_TIP_AMOUNT;
+      this.amountError = this.amountError || !+this.amount || this.amount < this.minTipAmount;
       this.noteError = !this.note || !this.url;
       this.confirmMode = !this.amountError && !this.noteError && this.validUrl && this.url;
       if (this.confirmMode) this.editUrl = false;
diff --git a/src/popup/utils/constants.js b/src/popup/utils/constants.js
index b0d899e67..763aa3296 100644
--- a/src/popup/utils/constants.js
+++ b/src/popup/utils/constants.js
@@ -182,4 +182,3 @@ export const IDENTICON_SIZES = {
   lg: 64,
 };
 
-export const MIN_TIP_AMOUNT = !process.env.RUNNING_IN_TESTS ? 0.1 : 0.001;
diff --git a/src/store/actions.js b/src/store/actions.js
index 6a6919711..58cda5b1b 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -180,6 +180,8 @@ export default {
       currency,
       currencyRate: currencies[currency],
     });
+    if (!process.env.RUNNING_IN_TESTS)
+      commit('setMinTipAmount', +(0.01 * (1 / currencies.usd)).toFixed(2));
   },
   async getCurrencies({ state: { nextCurrenciesFetch }, commit, dispatch }) {
     if (!nextCurrenciesFetch || nextCurrenciesFetch <= new Date().getTime()) {
diff --git a/src/store/index.js b/src/store/index.js
index 5bead5b44..fb4c53265 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -47,6 +47,7 @@ export default new Vuex.Store({
     nodeStatus: 'connecting',
     currencies: {},
     nextCurrenciesFetch: null,
+    minTipAmount: 0.01,
     notifications: [],
     notificationsCounter: null,
     tip: null,
@@ -96,6 +97,7 @@ export default new Vuex.Store({
         backedUpSeed,
         account,
         mnemonic,
+        minTipAmount,
       }) => ({
         migrations,
         current,
@@ -112,6 +114,7 @@ export default new Vuex.Store({
         backedUpSeed,
         account,
         mnemonic,
+        minTipAmount,
       }),
     ),
     modals,
diff --git a/src/store/mutations.js b/src/store/mutations.js
index 4dda1bb2c..da9f761b4 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -142,4 +142,7 @@ export default {
   [types.SET_TIPPING_ADDRESS](state, payload) {
     state.tippingAddress = payload;
   },
+  setMinTipAmount(state, payload) {
+    state.minTipAmount = payload;
+  },
 };

From f41c31f15aa0e08df686190805c198f563deb6dc Mon Sep 17 00:00:00 2001
From: Petar Baykov <petbaik26@gmail.com>
Date: Thu, 23 Apr 2020 18:01:00 +0300
Subject: [PATCH 09/14] Update constants.js

---
 src/popup/utils/constants.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/popup/utils/constants.js b/src/popup/utils/constants.js
index 763aa3296..71351b22d 100644
--- a/src/popup/utils/constants.js
+++ b/src/popup/utils/constants.js
@@ -181,4 +181,3 @@ export const IDENTICON_SIZES = {
   normal: 38,
   lg: 64,
 };
-

From 6f95a8f9179c72dd9c3ae336a7c389cf176b4da4 Mon Sep 17 00:00:00 2001
From: Petar Baykov <petbaik26@gmail.com>
Date: Thu, 23 Apr 2020 18:04:34 +0300
Subject: [PATCH 10/14] Remove account message warning

Co-Authored-By: Milen Radkov <milenradkov@me.com>
---
 src/popup/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/popup/locales/en.json b/src/popup/locales/en.json
index deceab914..51e76b651 100644
--- a/src/popup/locales/en.json
+++ b/src/popup/locales/en.json
@@ -68,7 +68,7 @@
     },
     "removeAccount": {
       "title": "Are you sure you want to remove this account?",
-      "msg": "This action cannot be undone"
+      "msg": "This action will remove your account from the wallet and will delete the extension storage. Make sure you have backed up your seed phrase before proceeding. This action cannot be undone!"
     },
     "cancel": "Cancel",
     "confirm": "Confirm"

From 654d2c24830f935dcae0bd9f87ca0155b718393b Mon Sep 17 00:00:00 2001
From: Petar Baykov <petbaik26@gmail.com>
Date: Thu, 23 Apr 2020 18:50:55 +0300
Subject: [PATCH 11/14] Add remove account option in settings page. Cleanup
 settings view

---
 src/mixins/removeAccount.js                 |  23 ++++
 src/popup/locales/en.json                   |   4 +-
 src/popup/router/components/SidebarMenu.vue |  20 +---
 src/popup/router/pages/Settings.vue         | 125 ++++++++------------
 4 files changed, 79 insertions(+), 93 deletions(-)
 create mode 100644 src/mixins/removeAccount.js

diff --git a/src/mixins/removeAccount.js b/src/mixins/removeAccount.js
new file mode 100644
index 000000000..481ae0ee0
--- /dev/null
+++ b/src/mixins/removeAccount.js
@@ -0,0 +1,23 @@
+import { AEX2_METHODS } from '../popup/utils/constants';
+import { postMessage } from '../popup/utils/connection';
+
+export default {
+  methods: {
+    async removeAccount() {
+      const remove = await this.$store
+        .dispatch('modals/open', {
+          name: 'confirm',
+          title: this.$t('modals.removeAccount.title'),
+          msg: this.$t('modals.removeAccount.msg'),
+        })
+        .catch(() => false);
+      if (remove) {
+        this.$emit('closeMenu');
+        await this.$store.dispatch('reset');
+        await this.$router.push('/');
+        this.$store.commit('SET_MAIN_LOADING', false);
+        if (process.env.IS_EXTENSION) postMessage({ type: AEX2_METHODS.LOGOUT });
+      }
+    },
+  },
+};
diff --git a/src/popup/locales/en.json b/src/popup/locales/en.json
index 51e76b651..2d69656d8 100644
--- a/src/popup/locales/en.json
+++ b/src/popup/locales/en.json
@@ -512,7 +512,9 @@
       "tabAbout": "About",
       "tabAboutsmall": "Version, support center and contact info",
       "tabNetworks": "Manage networks",
-      "tabNetworksSmall": "Connect to custom node"
+      "tabNetworksSmall": "Connect to custom node",
+      "tabRemoveAccount": "Remove account",
+      "tabRemoveAccountSmall": "Remove account from the wallet and delete extension storage"
     },
     "signAndVerifyMsg": {
       "backToSignVerifyMsg": "Back to Sign/Verify Message",
diff --git a/src/popup/router/components/SidebarMenu.vue b/src/popup/router/components/SidebarMenu.vue
index 02daa68e1..e022a2af9 100644
--- a/src/popup/router/components/SidebarMenu.vue
+++ b/src/popup/router/components/SidebarMenu.vue
@@ -102,10 +102,10 @@ import { mapGetters } from 'vuex';
 import Close from '../../../icons/close.svg?vue-component';
 import Arrow from '../../../icons/arrow-current-color.svg?vue-component';
 import UserAvatar from './UserAvatar';
-import { AEX2_METHODS } from '../../utils/constants';
-import { postMessage } from '../../utils/connection';
+import removeAccountMixin from '../../../mixins/removeAccount';
 
 export default {
+  mixins: [removeAccountMixin],
   components: { Close, Arrow, UserAvatar },
   computed: mapGetters(['account', 'activeAccountName']),
   data: () => ({ showSettingsDropdown: false }),
@@ -116,22 +116,6 @@ export default {
     closeMenu() {
       this.$emit('closeMenu');
     },
-    async removeAccount() {
-      const remove = await this.$store
-        .dispatch('modals/open', {
-          name: 'confirm',
-          title: this.$t('modals.removeAccount.title'),
-          msg: this.$t('modals.removeAccount.msg'),
-        })
-        .catch(() => false);
-      if (remove) {
-        this.$emit('closeMenu');
-        await this.$store.dispatch('reset');
-        await this.$router.push('/');
-        this.$store.commit('SET_MAIN_LOADING', false);
-        postMessage({ type: AEX2_METHODS.LOGOUT });
-      }
-    },
   },
 };
 </script>
diff --git a/src/popup/router/pages/Settings.vue b/src/popup/router/pages/Settings.vue
index 2be1aec77..7c8e54f92 100644
--- a/src/popup/router/pages/Settings.vue
+++ b/src/popup/router/pages/Settings.vue
@@ -1,98 +1,77 @@
 <template>
   <div class="popup">
-    <br />
-    <ae-list class="settingslist" face="primary">
-      <button class="generalsett" @click="GeneralSettings">
+    <ul class="settings-list">
+      <router-link to="/generalSettings">
         <span class="settings-li">{{ $t('pages.settings.tabGeneral') }}</span>
-        <i class="arrowright"></i>
-        <p class="tabinfo">{{ $t('pages.settings.tabGeneralsmall') }}</p>
-      </button>
-      <button class="securitysett" @click="SecuritySettings">
+        <i class="arrow-right"></i>
+        <p class="tab-info">{{ $t('pages.settings.tabGeneralsmall') }}</p>
+      </router-link>
+      <router-link to="/securitySettings">
         <span class="settings-li">{{ $t('pages.settings.tabSecurity') }}</span>
-        <i class="arrowright"></i>
-        <p class="tabinfo">{{ $t('pages.settings.tabSecuritysmall') }}</p>
-      </button>
-      <button class="aboutsett" @click="NetworkSettings">
+        <i class="arrow-right"></i>
+        <p class="tab-info">{{ $t('pages.settings.tabSecuritysmall') }}</p>
+      </router-link>
+      <router-link to="/networks">
         <span class="settings-li">{{ $t('pages.appVUE.networks') }}</span>
-        <i class="arrowright"></i>
-        <p class="tabinfo">{{ $t('pages.settings.tabNetworksSmall') }}</p>
+        <i class="arrow-right"></i>
+        <p class="tab-info">{{ $t('pages.settings.tabNetworksSmall') }}</p>
+      </router-link>
+      <button @click="removeAccount">
+        <span class="settings-li">{{ $t('pages.settings.tabRemoveAccount') }}</span>
+        <i class="arrow-right"></i>
+        <p class="tab-info">{{ $t('pages.settings.tabRemoveAccountSmall') }}</p>
       </button>
-    </ae-list>
-    <div v-if="loading" class="loading">
-      <ae-loader />
-    </div>
+    </ul>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
+import removeAccountMixin from '../../../mixins/removeAccount';
 
 export default {
-  data() {
-    return {
-      loading: false,
-    };
-  },
-  computed: {
-    ...mapGetters([
-      'account',
-      'balance',
-      'network',
-      'current',
-      'transactions',
-      'subaccounts',
-      'wallet',
-      'activeAccountName',
-      'activeAccount',
-    ]),
-  },
-  methods: {
-    GeneralSettings() {
-      this.$router.push('/generalSettings');
-    },
-    AdvancedSettings() {
-      this.$router.push('/advancedSettings');
-    },
-    SecuritySettings() {
-      this.$router.push('/securitySettings');
-    },
-    NetworkSettings() {
-      this.$router.push('/networks');
-    },
-    navigateAccount() {
-      this.$router.push('/account');
-    },
-  },
+  mixins: [removeAccountMixin],
 };
 </script>
 
 <style lang="scss">
-.settingslist {
+.settings-list {
   padding: 0 !important;
   background: #21222a !important;
-}
-.settingslist button {
-  transition: 0.4s;
-  position: relative;
-  padding: 1rem 1.5rem;
-  width: 100%;
-  display: block;
-  font-size: 14px;
-  border-bottom: 1px solid #ccc;
-}
-.settingslist button:hover {
-  border-left: 2px solid #2a9cff;
-  background: rgba(226, 226, 226, 0.5);
-  .arrowright {
-    right: 20px;
+  box-shadow: 0 0 8px rgba(0, 33, 87, 0.15);
+  border-radius: 4px;
+  margin-top: 30px;
+
+  a,
+  button {
+    text-decoration: none;
+    transition: 0.4s;
+    position: relative;
+    padding: 1rem 1.5rem;
+    width: 100%;
+    display: block;
+    font-size: 14px;
+    border-bottom: 1px solid #ccc;
+    text-align: left;
+
+    &:last-child {
+      border-bottom: 0;
+    }
+
+    &:hover {
+      border-left: 2px solid #2a9cff;
+      background: rgba(226, 226, 226, 0.5);
+      .arrow-right {
+        right: 20px;
+      }
+    }
   }
 }
+
 .settings-li {
   color: white;
-  float: left;
   font-size: 18px;
 }
-.arrowright {
+.arrow-right {
   transition: 0.4s;
   border: solid white;
   border-width: 0 4px 4px 0;
@@ -106,12 +85,10 @@ export default {
   margin-top: -15px;
   border-radius: 4px;
 }
-.tabinfo {
-  text-align: left;
+.tab-info {
   color: #ccc;
   font-weight: normal;
   margin: 5px 0;
-  float: left;
   width: 90%;
   word-break: break-word;
 }

From bcd546a9bf72a9177123045f126f766596f9c86d Mon Sep 17 00:00:00 2001
From: Petar Baykov <petbaik26@gmail.com>
Date: Fri, 24 Apr 2020 09:24:25 +0300
Subject: [PATCH 12/14] Info text explaining users that min tip amount is
 0.01USD in tokens

---
 src/popup/locales/en.json                  |  3 +-
 src/popup/router/components/AmountSend.vue | 85 +++++++++++++++-------
 src/popup/router/pages/Retip.vue           |  7 +-
 src/popup/router/pages/TipPage.vue         |  1 +
 src/store/index.js                         |  2 +-
 5 files changed, 68 insertions(+), 30 deletions(-)

diff --git a/src/popup/locales/en.json b/src/popup/locales/en.json
index 2d69656d8..7917b4256 100644
--- a/src/popup/locales/en.json
+++ b/src/popup/locales/en.json
@@ -647,7 +647,8 @@
       "enterUrl": "Enter tip url",
       "notClaimableUrlInfo": "Third party issues prevent us to ensure that tips will be directly delivered to the URL owner. You are sending the tip at your own risk.",
       "notVerifiedUrlInfo": "This URL has not yet been verified. The owner of the URL has to create account to claim their tokens.",
-      "verifiedUrlInfo": "If a URL is marked as verified, it means the owner of this URL is already a fellow Superhero — and that is awesome! An AE address has been included in the URL and tips can be claimed."
+      "verifiedUrlInfo": "If a URL is marked as verified, it means the owner of this URL is already a fellow Superhero — and that is awesome! An AE address has been included in the URL and tips can be claimed.",
+      "minAmountError": "You need to provide more than 0.01 USD in tokens in order to tip"
     },
     "successTip": {
       "sendMore": "Send More AE",
diff --git a/src/popup/router/components/AmountSend.vue b/src/popup/router/components/AmountSend.vue
index 65ad5b446..4fdd23e57 100644
--- a/src/popup/router/components/AmountSend.vue
+++ b/src/popup/router/components/AmountSend.vue
@@ -1,31 +1,34 @@
 <template>
-  <div class="flex flex-justify-between flex-align-start mt-25">
-    <Input
-      class="amount-box"
-      type="number"
-      :error="amountError || finalAmount <= 0"
-      v-model="finalAmount"
-      :placeholder="$t('pages.tipPage.amountPlaceholder')"
-      :label="$t('pages.tipPage.amountLabel')"
-    />
-    <div class="ml-15 text-left" style="margin-right:auto">
-      <p class="label hidden">Empty</p>
-      <span class="secondary-text f-14 block l-1" data-cy="amount">
-        {{ $t('pages.appVUE.aeid') }}</span
-      >
-      <span class="f-14 block l-1" data-cy="amount-currency"
-        >{{ getCurrencyAmount }} {{ currentCurrency }}</span
-      >
-    </div>
-    <div class="balance-box">
-      <p class="label">{{ $t('pages.tipPage.availableLabel') }}</p>
-      <span class="secondary-text f-14 block l-1" data-cy="balance"
-        >{{ tokenBalance }} {{ $t('pages.appVUE.aeid') }}</span
-      >
-      <span class="f-14 block l-1" data-cy="balance-currency"
-        >{{ balanceCurrency }} {{ currentCurrency }}</span
-      >
+  <div class="amount-send-container">
+    <div class="amount-send">
+      <Input
+        class="amount-box"
+        type="number"
+        :error="amountError || finalAmount <= 0"
+        v-model="finalAmount"
+        :placeholder="$t('pages.tipPage.amountPlaceholder')"
+        :label="$t('pages.tipPage.amountLabel')"
+      />
+      <div class="ml-15 text-left" style="margin-right:auto">
+        <p class="label hidden">Empty</p>
+        <span class="secondary-text f-14 block l-1" data-cy="amount">
+          {{ $t('pages.appVUE.aeid') }}
+        </span>
+        <span class="f-14 block l-1" data-cy="amount-currency">
+          {{ getCurrencyAmount }} {{ currentCurrency }}
+        </span>
+      </div>
+      <div class="balance-box">
+        <p class="label">{{ $t('pages.tipPage.availableLabel') }}</p>
+        <span class="secondary-text f-14 block l-1" data-cy="balance">
+          {{ tokenBalance }} {{ $t('pages.appVUE.aeid') }}
+        </span>
+        <span class="f-14 block l-1" data-cy="balance-currency">
+          {{ balanceCurrency }} {{ currentCurrency }}
+        </span>
+      </div>
     </div>
+    <div v-if="errorMsg" class="error-msg">{{ $t('pages.tipPage.minAmountError') }}</div>
   </div>
 </template>
 
@@ -37,7 +40,7 @@ export default {
   components: {
     Input,
   },
-  props: ['amountError', 'value'],
+  props: ['amountError', 'value', 'errorMsg'],
   data() {
     return {
       finalAmount: null,
@@ -63,3 +66,31 @@ export default {
   },
 };
 </script>
+
+<style lang="scss">
+@import '../../../common/variables';
+
+.amount-send-container {
+  margin-bottom: 22px;
+  margin-top: 25px;
+
+  .amount-send {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+
+    input.input {
+      margin-bottom: 0;
+    }
+  }
+
+  .error-msg {
+    font-weight: normal;
+    color: $input-error-color !important;
+    font-size: 12px;
+    word-break: break-word;
+    margin-top: 10px;
+    text-align: left;
+  }
+}
+</style>
diff --git a/src/popup/router/pages/Retip.vue b/src/popup/router/pages/Retip.vue
index a5fe94e62..3e0651c9f 100644
--- a/src/popup/router/pages/Retip.vue
+++ b/src/popup/router/pages/Retip.vue
@@ -13,7 +13,12 @@
       <a class="link-sm text-left" :class="{ 'not-verified': !urlVerified }">{{ tip.url }}</a>
     </div>
 
-    <AmountSend :amountError="amountError" @changeAmount="val => (amount = val)" :value="amount" />
+    <AmountSend
+      :amountError="amountError"
+      @changeAmount="val => (amount = val)"
+      :value="amount"
+      :errorMsg="amount && amount < minTipAmount"
+    />
     <div class="tip-note-preview mt-15">
       {{ tip.title }}
     </div>
diff --git a/src/popup/router/pages/TipPage.vue b/src/popup/router/pages/TipPage.vue
index 5fd0fee93..a34b8c8fa 100644
--- a/src/popup/router/pages/TipPage.vue
+++ b/src/popup/router/pages/TipPage.vue
@@ -41,6 +41,7 @@
           :amountError="amountError"
           @changeAmount="val => (amount = val)"
           :value="amount"
+          :errorMsg="amount && amount < minTipAmount"
         />
         <Textarea v-model="note" :placeholder="$t('pages.tipPage.titlePlaceholder')" size="sm" />
         <Button
diff --git a/src/store/index.js b/src/store/index.js
index 043f2251f..e26bd5e2e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -126,4 +126,4 @@ export default new Vuex.Store({
     ),
     modals,
   ],
-});
\ No newline at end of file
+});

From 1d7e4c9570a9cc63f73c3809149e163dfa448b88 Mon Sep 17 00:00:00 2001
From: Petar Baykov <petbaik26@gmail.com>
Date: Fri, 24 Apr 2020 10:13:21 +0300
Subject: [PATCH 13/14] Adjust tests to changes

---
 tests/e2e/integration/amount-send.js | 8 ++++----
 tests/e2e/integration/withdraw.js    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/e2e/integration/amount-send.js b/tests/e2e/integration/amount-send.js
index 295b05200..ce83815cf 100644
--- a/tests/e2e/integration/amount-send.js
+++ b/tests/e2e/integration/amount-send.js
@@ -12,7 +12,7 @@ describe('Test cases AmountSend component', () => {
       .enterAmountSend(0)
       .get('[data-cy=amount-currency]')
       .invoke('text')
-      .then(text => expect(text).to.eq('0.00 USD'));
+      .then(text => expect(text.trim()).to.eq('0.00 USD'));
   });
 
   it('Validate entered amount', () => {
@@ -20,7 +20,7 @@ describe('Test cases AmountSend component', () => {
       .inputShouldHaveError('[data-cy=input-number]')
       .get('[data-cy=amount-currency]')
       .invoke('text')
-      .then(text => expect(text).to.eq('0.00 USD'))
+      .then(text => expect(text.trim()).to.eq('0.00 USD'))
       .enterAmountSend(0)
       .get('[data-cy=input-number]')
       .should('have.class', 'has-error')
@@ -32,10 +32,10 @@ describe('Test cases AmountSend component', () => {
   it('Show correct balance', () => {
     cy.get('[data-cy=balance]')
       .invoke('text')
-      .then(text => expect(text).to.eq(`${balance.toFixed(2)} AE`))
+      .then(text => expect(text.trim()).to.eq(`${balance.toFixed(2)} AE`))
       .wait(2000)
       .get('[data-cy=balance-currency]')
       .invoke('text')
-      .then(text => expect(text).not.to.eq('0.00 USD'));
+      .then(text => expect(text.trim()).not.to.eq('0.00 USD'));
   });
 });
diff --git a/tests/e2e/integration/withdraw.js b/tests/e2e/integration/withdraw.js
index 57a771258..581bfc2cd 100644
--- a/tests/e2e/integration/withdraw.js
+++ b/tests/e2e/integration/withdraw.js
@@ -44,7 +44,7 @@ describe('Test cases for Withdraw Page', () => {
       .inputShouldHaveError('[data-cy=input-number]')
       .get('[data-cy=amount-currency]')
       .invoke('text')
-      .then(text => expect(text).to.eq('0.00 USD'))
+      .then(text => expect(text.trim()).to.eq('0.00 USD'))
       .enterAmountSend(0)
       .get('[data-cy=input-number]')
       .should('have.class', 'has-error')

From 472f7a66b1188ccd16c84b1cf694b2e8e6b92d5a Mon Sep 17 00:00:00 2001
From: Milen Radkov <milenradkov@me.com>
Date: Fri, 24 Apr 2020 12:28:20 +0300
Subject: [PATCH 14/14] 0.0.19

---
 config.xml        | 2 +-
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.xml b/config.xml
index 82e8566e8..df6b4c077 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.superhero.cordova" version="0.0.18" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.superhero.cordova" version="0.0.19" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>SuperHero</name>
     <description>SuperHero wallet</description>
     <author email="dev@cordova.apache.org" href="http://cordova.io">
diff --git a/package-lock.json b/package-lock.json
index 4782cd214..fe6645591 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "superhero-wallet",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 339a673c8..b8d109d0c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "superhero-wallet",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "Superhero wallet",
   "author": "SuperHero",
   "license": "MIT",