From 4bf9d211820b80fe6cb359ec162c584e77e1eb4d Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Thu, 19 Nov 2020 18:16:13 +0100
Subject: [PATCH 01/23] Added "withdraw all" for pending rewards

---
 app/src/components/withdraw/total.card.vue    |  80 +++++++
 app/src/views/wallet/delegation/index.vue     |   2 +-
 app/src/views/wallet/withdraw/index.vue       |  41 +++-
 .../withdraw/modals/withdraw-all.modal.vue    | 214 ++++++++++++++++++
 .../wallet/withdraw/modals/withdraw.modal.vue |   4 +-
 5 files changed, 331 insertions(+), 10 deletions(-)
 create mode 100644 app/src/components/withdraw/total.card.vue
 create mode 100644 app/src/views/wallet/withdraw/modals/withdraw-all.modal.vue

diff --git a/app/src/components/withdraw/total.card.vue b/app/src/components/withdraw/total.card.vue
new file mode 100644
index 0000000..a323eeb
--- /dev/null
+++ b/app/src/components/withdraw/total.card.vue
@@ -0,0 +1,80 @@
+<template>
+  <b-row class="total-card align-items-center mx-0">
+    <b-col>
+      <b-row class="w-100 align-items-center">
+        <b-col cols="4" class="text-right">
+          <h6 class="ml-4">Total</h6>
+        </b-col>
+        <b-col cols="4">
+          <span
+            :style="{
+              whiteSpace: 'nowrap',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+            }"
+          >
+          {{reward}} {{ globalData.kichain.token }}
+
+          </span>
+        </b-col>
+        <b-col cols="4" class="d-flex justify-content-end">
+          <slot />
+        </b-col>
+      </b-row>
+    </b-col>
+  </b-row>
+</template>
+
+<script>
+import { BRow, BCol, BButton } from 'bootstrap-vue';
+import * as numeral from 'numeral';
+import { mapState } from 'vuex';
+import { tokenUtil } from '@static/js/token';
+import util from '@static/js/util';
+
+export default {
+  components: {
+    BRow,
+    BCol,
+  },
+  props: {
+    reward: {
+      type: String,
+      default: null,
+    },
+  },
+  computed: {
+    ...mapState({
+      currentWallet: state => state.wallets.current,
+    }),
+  },
+  methods: {
+    formatAmount(amount) {
+      return tokenUtil.format(amount);
+    },
+  },
+};
+</script>
+
+<style scoped>
+.total-card {
+  width: 100%;
+  color: black;
+  min-height: 50px;
+  border: 1px solid #efefef;
+  border-radius: 10px;
+  background-color: white;
+  transition: box-shadow 240ms, transform 200ms;
+}
+.total-card:hover {
+  box-shadow: 0px 3px 3px rgba(154, 160, 185, 0.04);
+}
+.link {
+  color: var(--primary);
+  font-weight: 600;
+}
+.link:hover {
+  color: var(--primary);
+  text-decoration: underline;
+}
+</style>
diff --git a/app/src/views/wallet/delegation/index.vue b/app/src/views/wallet/delegation/index.vue
index e3ea4a5..98ca5bf 100644
--- a/app/src/views/wallet/delegation/index.vue
+++ b/app/src/views/wallet/delegation/index.vue
@@ -167,7 +167,7 @@ export default {
       text: '',
       my_v_list: [],
       currentPage: 1,
-      perPage: 10,
+      perPage: 9,
       buttons: [
         {
           caption: 'My',
diff --git a/app/src/views/wallet/withdraw/index.vue b/app/src/views/wallet/withdraw/index.vue
index 38d536f..79ab7a9 100644
--- a/app/src/views/wallet/withdraw/index.vue
+++ b/app/src/views/wallet/withdraw/index.vue
@@ -57,6 +57,18 @@
             Withdraw
           </a>
         </ValidatorCard>
+        <TotalCard
+          :key="`total`"
+          :reward="mergedRewards"
+          class="mb-2"
+        >
+          <a
+            v-b-modal="'withdraw-all-modal'"
+            class="link"
+          >
+            Withdraw all
+          </a>
+        </TotalCard>
       </div>
       <div
         class="mt-2 mb-2"
@@ -92,6 +104,11 @@
         @onWithdrawSuccess="handleWithdrawSuccess"
       />
     </div>
+    <WithdrawAllModal
+     :validators="validators"
+     :rewards="rewards"
+     @onWithdrawSuccess="handleWithdrawSuccess"
+     />
   </div>
 </template>
 
@@ -100,33 +117,36 @@ import { mapActions, mapState } from 'vuex';
 import {
   BRow,
   BCol,
-  BButton,
-  BButtonGroup,
   BPagination,
   BFormInput,
 } from 'bootstrap-vue';
 import { FETCH_WALLET_VALIDATORS, FETCH_WALLET_REWARDS } from '@store/wallets';
 import ValidatorCard from '@cmp/validator/validator.card';
+import TotalCard from '@cmp/withdraw/total.card';
 import WithdrawModal from './modals/withdraw.modal';
+import WithdrawAllModal from './modals/withdraw-all.modal';
+import * as numeral from 'numeral';
+import { tokenUtil } from '@static/js/token';
 
 export default {
   components: {
+    TotalCard,
     ValidatorCard,
     BPagination,
     BFormInput,
     WithdrawModal,
+    WithdrawAllModal,
   },
   data() {
     return {
       selectedValidator: null,
       text: '',
       currentPage: 1,
-      perPage: 10,
+      perPage: 8,
     };
   },
   computed: {
     ...mapState({
-      advanced: state => state.app.advanced,
       myValidators: state => state.wallets.current.validators,
       rewards:  state => state.wallets.current.rewards,
       account: state => state.account,
@@ -140,8 +160,16 @@ export default {
         });
       return val
     },
-  },
-  created() {
+
+    mergedRewards(){
+      var pending = 0;
+
+      for (var val in this.rewards){
+        pending +=  numeral(this.rewards[val]).value() * Math.pow(10, 6)
+      }
+      return tokenUtil.format(pending)
+    }
+
   },
   mounted() {
      this.fetchRewards();
@@ -159,6 +187,7 @@ export default {
       await this.fetchMyValidators();
       await this.fetchRewards();
       this.$bvModal.hide('withdraw-modal');
+      this.$bvModal.hide('withdraw-all-modal');
     },
   },
 };
diff --git a/app/src/views/wallet/withdraw/modals/withdraw-all.modal.vue b/app/src/views/wallet/withdraw/modals/withdraw-all.modal.vue
new file mode 100644
index 0000000..1d84e36
--- /dev/null
+++ b/app/src/views/wallet/withdraw/modals/withdraw-all.modal.vue
@@ -0,0 +1,214 @@
+<template>
+  <b-modal
+    :id="modalId"
+    tabindex="-1"
+    :title="`Withdraw all rewards`"
+    hide-footer
+    @show="resetData"
+  >
+    <div class="basic-form modal-body">
+      <form class="basic-form">
+        <div v-if="!multisig">
+          <label>{{ $t('enter_password') }}</label>
+          <div class="buttonInside">
+            <input
+              v-model="wallet_pass_tmp"
+              :type="password"
+              :class="[wallet_pass_tmp ? '' : withdraw.alert]"
+            />
+            <a
+              v-if="password == 'password'"
+              class="inside"
+              @click="password = 'text'"
+              ><img
+                src="static/img/icons/eye-on.png"
+                style="width:25px; opacity:0.2"
+            /></a>
+
+            <a
+              v-if="password == 'text'"
+              class="inside"
+              @click="password = 'password'"
+              ><img
+                src="static/img/icons/eye-off.png"
+                style="width:25px; opacity:0.2"
+            /></a>
+          </div>
+        </div>
+        <li v-if="withdraw.output != ''" class="token">
+          <label>{{ $t('webwallet_output') }}</label>
+          <textarea v-model="withdraw.output" class="" rows="3" disabled />
+        </li>
+        <b-row align-v="center" align-h="center">
+          <b-col class="text-center">
+            <button
+              class="btn btn-primary"
+              :disabled="tx.loading === true"
+              @click="sendWithdrawTx"
+            >
+              <div v-if="!tx.loading">
+                <span v-if="!multisig">
+                  {{ $t('withdrawtx') }}
+                </span>
+                <span v-else>Generate</span>
+              </div>
+              <div v-else>
+                <b-spinner small label="Small Spinner" />
+              </div>
+            </button>
+          </b-col>
+        </b-row>
+      </form>
+    </div>
+  </b-modal>
+</template>
+
+<script>
+import { BRow, BCol, BSpinner, BModal } from 'bootstrap-vue';
+import * as numeral from 'numeral';
+import { mapActions } from 'vuex';
+import { POST_TX } from '@store/tx';
+export default {
+  components: {
+    BRow,
+    BCol,
+    BSpinner,
+    BModal,
+  },
+  props: {
+    modalId: {
+      type: String,
+      default: 'withdraw-all-modal',
+    },
+    validators: {
+      type: Array,
+      default: null,
+    },
+    rewards: {
+      type: Object,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      udenom: this.globalData.kichain.udenom,
+      withdraw: {
+        alert: '',
+        config: 0,
+        output: '',
+      },
+      password: 'password',
+      wallet_pass_tmp: '',
+    };
+  },
+  computed: {
+    currentWallet() {
+      return this.$store.state.wallets.current;
+    },
+    advanced() {
+      return this.$store.state.app.advanced;
+    },
+    multisig() {
+      return this.$store.state.wallets.current.multisign;
+    },
+    account() {
+      return this.$store.state.account;
+    },
+    tx() {
+      return this.$store.state.tx;
+    },
+  },
+  methods: {
+    ...mapActions({
+      postTx: POST_TX,
+    }),
+    resetData() {
+      this.wallet_pass_tmp = '';
+      (this.password = 'password'),
+        (this.withdraw = {
+          alert: '',
+          config: 0,
+          output: '',
+        });
+    },
+    async sendWithdrawTx() {
+      this.withdraw.alert = 'danger';
+      let filled = true;
+
+      if (this.wallet_pass_tmp === '' && !this.multisig) {
+        filled = false;
+      }
+
+      if (!filled) {
+        return false;
+      }
+
+      var msg_withdraw_reward = []
+      for ( var validator of this.validators ){
+        if (numeral(this.rewards[validator.operator_address]).value() > 2 ){
+          msg_withdraw_reward.push({
+            type: 'cosmos-sdk/MsgWithdrawDelegationReward',
+            value: {
+              delegator_address: this.account.id,
+              validator_address: validator.operator_address,
+            },
+          })
+        }
+      }
+
+      const limit = Math.max(200000, msg_withdraw_reward.length * 100000);
+      const fees = limit * 0.025
+
+
+      const transaction = {
+        msg: [],
+        fee: {
+          amount: [{
+            denom: this.udenom,
+            amount: fees.toString(),
+          }],
+          gas: limit.toString(),
+        },
+        memo: '',
+      };
+
+      transaction.msg = msg_withdraw_reward;
+
+      if (this.multisig) {
+        this.withdraw.output =
+          '{ "type": "cosmos-sdk/StdTx", "value":' +
+          JSON.stringify(transaction) +
+          '}';
+      }
+
+      else {
+        try {
+          await this.postTx({
+            transaction,
+            password: this.wallet_pass_tmp,
+          });
+          this.$bvToast.toast('Transaction sent with success', {
+            variant: 'success',
+            autoHideDelay: 2000,
+            noCloseButton: true,
+            solid: true,
+            toaster: 'b-toaster-bottom-center',
+          });
+          this.$emit('onWithdrawSuccess');
+        } catch (error) {
+          this.$bvToast.toast(error, {
+            variant: 'danger',
+            autoHideDelay: 2000,
+            solid: true,
+            noCloseButton: true,
+            toaster: 'b-toaster-bottom-center',
+          });
+          this.$emit('onWithdrawError');
+        }
+      }
+    },
+  },
+};
+</script>
+
+<style scoped></style>
diff --git a/app/src/views/wallet/withdraw/modals/withdraw.modal.vue b/app/src/views/wallet/withdraw/modals/withdraw.modal.vue
index 401c443..76969d1 100644
--- a/app/src/views/wallet/withdraw/modals/withdraw.modal.vue
+++ b/app/src/views/wallet/withdraw/modals/withdraw.modal.vue
@@ -158,9 +158,7 @@ export default {
           output: '',
         });
     },
-    formatAmount(amount) {
-      return numeral(amount / Math.pow(10, 6)).format('0,0.000000');
-    },
+
     async sendWithdrawTx() {
       this.withdraw.alert = 'danger';
       let filled = true;

From f81477be17a39a8d8505821475e66c0c6561158c Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Thu, 19 Nov 2020 18:37:30 +0100
Subject: [PATCH 02/23] Bump electron version

---
 app/index.html        |  2 +-
 app/package-lock.json | 56 +++++++++++++++++++++----------------------
 app/package.json      |  4 ++--
 package-lock.json     |  8 +++----
 package.json          |  4 ++--
 splashscreen.html     |  2 +-
 6 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/app/index.html b/app/index.html
index e0fd72a..a99f8bf 100644
--- a/app/index.html
+++ b/app/index.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <link rel="shortcut icon" type="image/png" href="static/img/chain/kichain_icon@2x.png">
-  <title>Ki Wallet 0.2.2</title>
+  <title>Ki Wallet 0.3.0 beta</title>
 </head>
 
 <body>
diff --git a/app/package-lock.json b/app/package-lock.json
index 81c49c2..01d9c69 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "Ki-Wallet",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -186,11 +186,11 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
@@ -1819,9 +1819,9 @@
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
     },
     "boolean": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz",
-      "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.2.tgz",
+      "integrity": "sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==",
       "optional": true
     },
     "bootstrap": {
@@ -2112,9 +2112,9 @@
       },
       "dependencies": {
         "get-stream": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
           "requires": {
             "pump": "^3.0.0"
           }
@@ -2768,9 +2768,9 @@
       }
     },
     "core-js": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
-      "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz",
+      "integrity": "sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==",
       "optional": true
     },
     "core-util-is": {
@@ -4231,9 +4231,9 @@
       "dev": true
     },
     "electron": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-8.4.0.tgz",
-      "integrity": "sha512-SpgyccM5rjDJSGcpQjiviUBT44fZlSyhcjy8RpKSnAad+co4xY1vYj6T25U1CfSk0PH/dhvcp63P2sdXHCwq/Q==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-11.0.1.tgz",
+      "integrity": "sha512-UefDvxeyTREL1FpC0BcXwzLjcYiQICFSZONbwarpoqTXQU5rzEguIegHPqg5AqwYH4FVYfEuigj/Vm94rtZOzg==",
       "requires": {
         "@electron/get": "^1.0.1",
         "@types/node": "^12.0.12",
@@ -4241,9 +4241,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "12.12.50",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.50.tgz",
-          "integrity": "sha512-5ImO01Fb8YsEOYpV+aeyGYztcYcjGsBvN4D7G5r1ef2cuQOpymjWNQi5V0rKHE6PC2ru3HkoUr/Br2/8GUA84w=="
+          "version": "12.19.5",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.5.tgz",
+          "integrity": "sha512-Wgdl27uw/jUYUFyajUGKSjDNGxmJrZi9sjeG6UJImgUtKbJoO9aldx+1XODN1EpNDX9DirvbvHHmTsNlb8GwMA=="
         }
       }
     },
@@ -12177,12 +12177,12 @@
       }
     },
     "roarr": {
-      "version": "2.15.3",
-      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.3.tgz",
-      "integrity": "sha512-AEjYvmAhlyxOeB9OqPUzQCo3kuAkNfuDk/HqWbZdFsqDFpapkTjiw+p4svNEoRLvuqNTxqfL+s+gtD4eDgZ+CA==",
+      "version": "2.15.4",
+      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
+      "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
       "optional": true,
       "requires": {
-        "boolean": "^3.0.0",
+        "boolean": "^3.0.1",
         "detect-node": "^2.0.4",
         "globalthis": "^1.0.1",
         "json-stringify-safe": "^5.0.1",
@@ -13207,11 +13207,11 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
diff --git a/app/package.json b/app/package.json
index 66e6b0c..04865a2 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Ki-Wallet",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "ki-wallet",
   "author": "Ki Foundation",
   "private": true,
@@ -22,7 +22,7 @@
     "bootstrap-vue": "^2.12.0",
     "clipboard": "^2.0.4",
     "crypto-js": "^4.0.0",
-    "electron": "^8.2.4",
+    "electron": ">=8.5.2",
     "es6-promise": "^4.2.8",
     "jquery": "^3.4.1",
     "kind-of": ">=6.0.3",
diff --git a/package-lock.json b/package-lock.json
index 042ea11..c9c8b12 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ki-desktop-wallet",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -377,9 +377,9 @@
       "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
     },
     "electron": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-8.4.0.tgz",
-      "integrity": "sha512-SpgyccM5rjDJSGcpQjiviUBT44fZlSyhcjy8RpKSnAad+co4xY1vYj6T25U1CfSk0PH/dhvcp63P2sdXHCwq/Q==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-11.0.1.tgz",
+      "integrity": "sha512-UefDvxeyTREL1FpC0BcXwzLjcYiQICFSZONbwarpoqTXQU5rzEguIegHPqg5AqwYH4FVYfEuigj/Vm94rtZOzg==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
diff --git a/package.json b/package.json
index e5932c9..4f015df 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "productName": "Ki Desktop Wallet",
   "name": "ki-desktop-wallet",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "The KiCahin wallet",
   "main": "main.js",
   "scripts": {
@@ -17,7 +17,7 @@
   "author": "KiFoundation",
   "license": "CC0-1.0",
   "devDependencies": {
-    "electron": "^8.2.4",
+    "electron": ">=8.5.2",
     "electron-winstaller": "^4.0.0",
     "electron-wix-msi": "^2.2.0"
   },
diff --git a/splashscreen.html b/splashscreen.html
index 8a2bb0a..900c39b 100644
--- a/splashscreen.html
+++ b/splashscreen.html
@@ -63,7 +63,7 @@
     </div>
     <div class="footer ">
       <span>
-        0.2.2
+        0.3.0 beta
       </span>
     </div>
 

From 7c92b08f17d9513a6ac80955fc53cc1b69969350 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Fri, 20 Nov 2020 18:30:55 +0100
Subject: [PATCH 03/23] Improved styling

---
 app/src/components/private-layout/index.vue | 11 +++++------
 app/src/views/wallet/delegation/index.vue   |  6 +++---
 app/static/css/index.css                    |  4 +---
 main.js                                     |  8 ++++----
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/src/components/private-layout/index.vue b/app/src/components/private-layout/index.vue
index db00571..f86cf5b 100644
--- a/app/src/components/private-layout/index.vue
+++ b/app/src/components/private-layout/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <b-container class="py-5 h-100">
+  <div class="py-4 px-4 h-100 mx-auto" style="max-width: 1100px;">
     <b-row>
-      <b-col class="pr-0" :style="{ marginRight: '5px' }" cols="1">
+      <b-col class="pr-0" :style="{ marginRight: '10px' }" cols="1">
         <CornerLogo />
       </b-col>
       <b-col class="pl-0">
@@ -9,7 +9,7 @@
       </b-col>
     </b-row>
     <b-row :style="{ marginTop: '5px', height: 'calc(100% - 80px)' }">
-      <b-col class="pr-0" cols="1" :style="{ marginRight: '5px' }">
+      <b-col class="pr-0" cols="1" :style="{ marginRight: '10px' }">
         <SideMenu />
       </b-col>
       <b-col class="pl-0 h-100">
@@ -18,11 +18,11 @@
         </Content>
       </b-col>
     </b-row>
-  </b-container>
+  </div>
 </template>
 
 <script>
-import { BContainer, BRow, BCol } from 'bootstrap-vue';
+import {BRow, BCol } from 'bootstrap-vue';
 import CornerLogo from './corner-logo';
 import TopBar from './topbar/index';
 import Content from './content';
@@ -30,7 +30,6 @@ import SideMenu from './sidemenu';
 
 export default {
   components: {
-    'b-container': BContainer,
     'b-row': BRow,
     'b-col': BCol,
     CornerLogo,
diff --git a/app/src/views/wallet/delegation/index.vue b/app/src/views/wallet/delegation/index.vue
index 98ca5bf..af42f8b 100644
--- a/app/src/views/wallet/delegation/index.vue
+++ b/app/src/views/wallet/delegation/index.vue
@@ -62,14 +62,14 @@
           <div>
             <a
               v-b-modal="'delegate-modal'"
-              class="link"
+              class="link ml-2"
               @click="selectedValidator = validator"
             >
               Delegate
             </a>
             <a
               v-b-modal="'undelegate-modal'"
-              :class="{'link':my_v_list.includes(validator.operator_address) ,'ml-3':true}"
+              :class="{'link':my_v_list.includes(validator.operator_address) ,'ml-2':true}"
               @click="selectedValidator = validator; "
               :disabled="!my_v_list.includes(validator.operator_address)"
             >
@@ -78,7 +78,7 @@
             <a
               v-b-modal="'redelegate-modal'"
               :class="{'link':my_v_list.includes(validator.operator_address) ,
-                        'ml-3':true}"
+                        'ml-2':true}"
               @click="selectedValidator = validator"
               :disabled="!my_v_list.includes(validator.operator_address)"
             >
diff --git a/app/static/css/index.css b/app/static/css/index.css
index 5b4ce2a..c57265b 100644
--- a/app/static/css/index.css
+++ b/app/static/css/index.css
@@ -68,9 +68,7 @@ body {
   color: #000;
   background-color: var(--pale-grey);
   /* background-color: var(--darkbg); */
-  min-width: 1040px;
-  /* overflow: scroll; */
-  /* min-height: 100vh; */
+  min-width: 1000px;
 }
 
 ul,
diff --git a/main.js b/main.js
index 37e1d03..d3932e8 100644
--- a/main.js
+++ b/main.js
@@ -8,10 +8,10 @@ function createWindow() {
   // Create the browser window.
   const mainWindow = new BrowserWindow({
     // backgroundColor: '#043bea',
-    width: 1250,
-    height: 950,
-    minWidth: 1250,
-    minWidth: 900,
+    width: 1200,
+    height: 810,
+    minWidth: 1200,
+    // minWidth: 900,
     show: false,
     // frame:false,
     // titleBarStyle: 'hiddenInset',

From 686e0cf2413e5f74ae350016ba6ba9cc06628731 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Fri, 11 Dec 2020 11:37:30 +0100
Subject: [PATCH 04/23] Add wallet categories P1

---
 app/src/App.vue                             |   3 +-
 app/src/components/wallets/wallets-list.vue | 226 ++++++++++++++++++--
 2 files changed, 215 insertions(+), 14 deletions(-)

diff --git a/app/src/App.vue b/app/src/App.vue
index 107f33d..db14a6f 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -164,7 +164,8 @@ export default {
                   publickey: Buffer.from(lse_temp.publicKey, ).toString('hex'),
                   ms: lse_temp.ms,
                   offline: lse_temp.offline,
-                  invalid: lse_temp.invalid
+                  invalid: lse_temp.invalid,
+                  category: lse_temp.category != undefined ? lse_temp.category : "uncategorised"
                 }
 
                 if (wallet_tmp.ms) {
diff --git a/app/src/components/wallets/wallets-list.vue b/app/src/components/wallets/wallets-list.vue
index 360dfb8..b2eea18 100644
--- a/app/src/components/wallets/wallets-list.vue
+++ b/app/src/components/wallets/wallets-list.vue
@@ -1,40 +1,137 @@
 <template>
+<div>
   <b-row v-if="list.length" class="w-100 mx-0 pl-3">
-    <b-col
-      v-for="(wallet, index) in list"
-      :key="index"
-      cols="4"
-      :class="[
-        'mb-3 pl-0 pr-3',
-      ]"
-    >
-      <WalletCard :wallet="wallet" @onSelectWallet="onSelectWallet" />
-    </b-col>
+    <div class="accordion">
+      <div class="accordion-item" v-for="(content, i) in contents" v-bind:key="i" v-bind:class="{ 'accordion-active': content.active }">
+        <div v-if="content.list.length != 0">
+        <div class="accordion-header">
+          <a href="#" v-on:click="expand(i)">
+            <div class="accordion-header-div">{{ content.title }}</div>
+            <div class="accordion-header-div">
+              <div class="accordion-caret" />
+            </div>
+          </a>
+        </div>
+        <div class="accordion-body" v-bind:ref="'accordion-body-' + i">
+          <b-row class="w-100 mx-0 pl-3">
+            <b-col v-for="(wallet, index) in content.list" :key="index" cols="4" :class="[
+                'mb-3 pl-0 pr-3',
+              ]">
+              <WalletCard :wallet="wallet" @onSelectWallet="onSelectWallet" />
+            </b-col>
+          </b-row>
+        </div>
+
+        </div>
+      </div>
+    </div>
   </b-row>
   <b-row v-else>
     <b-col>
       No wallets
     </b-col>
   </b-row>
+</div>
 </template>
 
 <script>
-import { BRow, BCol } from 'bootstrap-vue';
+import {
+  BRow,
+  BCol
+} from 'bootstrap-vue';
 import WalletCard from '@cmp/wallets/wallet-card';
-import { mapState } from 'vuex';
+// import WalletAcc from '@cmp/wallets/wallets-accordion';
+import {  mapState } from 'vuex';
+import gsap from 'gsap'
 
 export default {
   components: {
     WalletCard,
+    // WalletAcc,
     BRow,
     BCol,
   },
+  data() {
+    return {}
+  },
   computed: {
     ...mapState({
       list: state => state.wallets.list,
     }),
+    contents() {
+      return {
+        personal: {
+        title: 'Personal',
+        description: 'Personal wallets',
+        active: false,
+        list: [],
+      },
+      work:{
+        title: 'Work',
+        description: 'Work wallets',
+        active: false,
+        list: [],
+      },
+      multisig: {
+        title: 'Multisig',
+        description: 'Multisig wallets',
+        active: false,
+        list: [],
+      },
+      uncategorised: {
+        title: 'Uncategorised',
+        description: 'Other wallets',
+        active: false,
+        list: [],
+      }
+    }
+    }
+  },
+  created() {
+    this.splitCategories();
+  },
+  mounted(){
+    this.expandDefault();
+
   },
   methods: {
+    splitCategories(){
+      for (var wallet of this.list){
+        this.contents[wallet.category].list.push(wallet);
+      }
+      // console.log(this.contents)
+    },
+
+    expandDefault(){
+      console.log(this.$refs['accordion-body-uncategorised'])
+      let el = this.$refs['accordion-body-uncategorised'][0];
+      this.contents.uncategorised.active = true;
+
+      gsap.to(el, 1, {
+        height: el.scrollHeight,
+        ease: "elastic(1, 0.9)"
+      });
+    },
+    expand(i) {
+      event.preventDefault();
+
+      let el = this.$refs['accordion-body-' + i][0];
+      if (this.contents[i].active === false) {
+        this.contents[i].active = true;
+
+        gsap.to(el, 1, {
+          height: el.scrollHeight,
+          ease: "elastic(1, 0.9)"
+        });
+      } else {
+        this.contents[i].active = false;
+
+        gsap.to(el, 0.5, {
+          height: 0,
+          // ease: "bounce"
+        });
+      }
+    },
     onSelectWallet(wallet) {
       this.$emit('onSelectWallet', wallet);
     },
@@ -42,4 +139,107 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.accordion,
+.accordion-item,
+.accordion-header,
+.accordion-body {
+	font-family: inherit;
+}
+
+.accordion {
+	/* background-color: #ffffff; */
+	width: 100%;
+	max-height: 100%;
+	/* max-width: 320px;  */
+	padding: 2rem 1rem;
+	margin: auto;
+	box-sizing: border-box;
+	overflow: auto;
+	/* box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.3); */
+}
+
+.accordion-item.accordion-active.accordion-caret {
+		animation: accordion-is-active 200ms linear forwards;
+}
+
+.accordion-header {
+	color: inherit;
+	font-size: 1.2rem;
+	font-weight: bold;
+	position: relative;
+
+}
+
+.accordion-header a {
+  color: inherit;
+  text-decoration: none;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: space-between;
+  box-sizing: border-box;
+  border-radius: 0.2rem;
+  transition: background-color 200ms ease-in-out;
+
+}
+.accordion-header a:not(.accordion-active):hover {
+  /* background-color: #d8d2ef8f; */
+}
+
+.accordion-header-div {
+	padding: 1rem 1rem 1rem 1rem;
+}
+
+.accordion-header-div:last-child {
+  padding-left: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.accordion-caret {
+	background-image: linear-gradient(
+  	to top right,
+  	transparent 50%,
+  	#727272 50%
+  );
+	width: 0.5rem;
+	height: 0.5rem;
+	transform: rotate(-45deg);
+	animation: accordion-is-inactive 200ms linear forwards;
+}
+
+.accordion-body {
+	height: 0;
+	overflow: hidden;
+}
+
+.accordion-content {
+	padding: 1rem;
+}
+
+@keyframes accordion-is-inactive {
+	0%   { transform: rotate(-45deg); }
+	50%  { transform: scale(1.5) rotate(45deg); }
+	100% { transform: rotate(135deg); }
+}
+
+@keyframes accordion-is-active {
+	0%   { transform: rotate(135deg); }
+	50%  { transform: scale(1.5) rotate(45deg); }
+	100% { transform:  rotate(-45deg); }
+}
+
+@media screen and (min-width: var(--base-width) {
+	#app {
+		padding: 2rem;
+		overflow: auto;
+	}
+
+	.accordion {
+		max-height: none;
+		border-radius: 0.5rem;
+	}
+}
+</style>

From 932198700c8b4722cfe754a929387b5828ab01e0 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Thu, 17 Dec 2020 16:33:44 +0100
Subject: [PATCH 05/23] Added wallet edit modal P1

---
 .../components/wallets/modals/edit-wallet.vue | 316 ++++++++++++++++++
 app/src/components/wallets/wallet-card.vue    |  39 ++-
 app/src/components/wallets/wallets-list.vue   |   2 -
 app/static/lang/en.js                         |   2 +
 4 files changed, 351 insertions(+), 8 deletions(-)
 create mode 100644 app/src/components/wallets/modals/edit-wallet.vue

diff --git a/app/src/components/wallets/modals/edit-wallet.vue b/app/src/components/wallets/modals/edit-wallet.vue
new file mode 100644
index 0000000..4c6f328
--- /dev/null
+++ b/app/src/components/wallets/modals/edit-wallet.vue
@@ -0,0 +1,316 @@
+<template>
+<div :id="modalId" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="importLongTitle" aria-hidden="true" data-backdrop="static" data-keyboard="false">
+  <div class="modal-dialog modal-lg modal-dialog-centered" role="document" style="width:500px">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close" @click="onResetModal">
+          <span aria-hidden="true" >&times;</span>
+        </button>
+      </div>
+
+      <div class="basic-form modal-body">
+        <div class="mnemonic-group">
+          <div class="modal-header" >
+             <h5 id="importTitle" class="modal-title">
+              {{ $t('webwallet_edit_title') }}
+            </h5>
+          </div>
+          <div class="mnemonic-form">
+            <div v-if="step==0">
+              <b-row style="margin-bottom:10px;">
+                <b-col cols="10">
+                  <h6>Wallet name</h6>
+                </b-col>
+                <b-col />
+              </b-row>
+              <b-row style="margin-bottom:20px;">
+                <b-col>Change the name of wallet </b-col>
+              </b-row>
+              <input v-model="wallet_name" type="text" @input="
+                    validateWalltName();
+                    validateWalltNameExist();
+                  " />
+              <span v-if="!name_correct" class="mnemonic-error">{{
+                  $t('error_wallet_name')
+                }}</span>
+              <span v-if="name_correct && name_exists" class="mnemonic-error">
+                {{ $t('error_wallet_name_exists') }}
+              </span>
+
+              <b-row style="margin-bottom:10px;margin-top:20px;">
+                <b-col cols="10">
+                  <h6>Category</h6>
+                </b-col>
+                <b-col />
+              </b-row>
+              <b-row style="margin-bottom:15px;" align-v="center">
+                <b-col cols="10">{{ $t('wallet_category') }}</b-col>
+              </b-row>
+              <b-button v-for="(btn, idx) in buttons" size="sm" :key="idx" :pressed="filter === btn.filter" variant="outline-primary" style="margin-right:5px;margin-top:5px;" @click="btn.onPress(btn.filter)">
+                {{ btn.caption }}
+              </b-button>
+
+              <b-row style="margin-bottom:10px;margin-top:20px;">
+                <b-col cols="10">
+                  <h6>Delete this wallet</h6>
+                </b-col>
+                <b-col />
+              </b-row>
+
+              <b-row style="margin-bottom:20px;">
+                <b-col>Enter the name of the wallet you want to delete to confirm </b-col>
+              </b-row>
+              <input v-model="wallet_name" type="text" @input="
+                    validateWalltName();
+                    validateWalltNameExist();
+                  "
+                  class="danger"/>
+                </div>
+          </div>
+          <div style="margin-bottom:20px">
+            <div class="mnemonic-form">
+              <b-row>
+                <!-- Main button warning section -->
+                <b-col>
+                  <!-- Main button -->
+                  <div class="d-flex justify-content-center">
+                    <button class="btn btn-primary" @click="proceed" :disabled="!disabled">
+                      <span>{{$t(workflow[step])}}</span>
+                    </button>
+                  </div>
+                </b-col>
+              </b-row>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+</template>
+
+<script>
+import {
+  BRow,
+  BCol,
+  BButton,
+} from 'bootstrap-vue';
+
+export default {
+  components: {
+    BRow,
+    BCol,
+    BButton,
+  },
+  props: {
+    modalId: {
+      type: String,
+      default: 'modalId',
+    },
+  },
+  data() {
+    return {
+      workflow: ['Save'],
+      step: 0,
+      filter: 'u',
+      wallet_name: '',
+      name_exists: false,
+      name_correct: true,
+      disabled: false,
+
+      buttons: [
+        {
+          caption: 'Personal',
+          onPress: this.handleCat,
+          filter: 'p',
+        },
+        {
+          caption: 'Work',
+          onPress: this.handleCat,
+          filter: 'w',
+        },
+        {
+          caption: 'Multisignature',
+          onPress: this.handleCat,
+          filter: 'm',
+        },
+        {
+            caption: 'Uncategorized',
+            onPress: this.handleCat,
+            filter: 'u',
+          },
+      ],
+    };
+  },
+  methods: {
+    onResetModal() {
+      this.step = 0;
+      this.filter = 'u';
+      this.mnemonic = '';
+      this.ms_address = '';
+      this.wallet_name = '';
+      this.offline_address ='';
+      this.wallet_pass_tmp = '';
+      this.disabled = false;
+      this.multisig = false;
+      this.name_exists = false;
+      this.name_correct = true;
+    },
+    validatePassword() {
+      if (!this.wallet_pass_tmp) {
+        this.password_correct = false;
+      } else {
+        var ok_password = new RegExp(
+          '^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.{8,})',
+        );
+        if (!ok_password.test(this.wallet_pass_tmp)) {
+          this.password_correct = false;
+        } else {
+          this.password_correct = true;
+        }
+      }
+      this.disabled = this.password_correct
+
+    },
+    toggletPasswordVisible() {
+      this.password_visible = !this.password_visible;
+    },
+
+    validateWalltName() {
+      if (!this.wallet_name) {
+        this.name_correct = false;
+      } else {
+        if (this.wallet_name.match(/[^\w\.\-]/)) {
+          this.name_correct = false;
+        } else {
+          this.name_correct = true;
+        }
+      }
+      this.disabled = this.name_correct && !this.name_exists;
+
+    },
+    validateWalltNameExist() {
+      let wallet_list = this.wallet_name;
+
+      if (localStorage.getItem('wallet_list')) {
+        let wallet_list_old = localStorage.getItem('wallet_list').split(',');
+        if (wallet_list_old.includes(wallet_list)) {
+          this.name_exists = true;
+        } else {
+          this.name_exists = false;
+        }
+      }
+      this.disabled = this.name_correct && !this.name_exists;
+    },
+
+    async proceed(e) {
+    },
+
+    handleCat(cat) {
+        this.filter = cat;
+    },
+  },
+};
+</script>
+
+<style scoped>
+.mnemonic-description {
+  font-size: 14px;
+  margin: 0px 0 8px;
+  font-weight: bold;
+  /* color: var(--darkbg) */
+}
+
+.mnemonic-form {
+  text-align: left;
+  font-size: 12px;
+  line-height: 16px;
+  margin: 10px 0 8px;
+  font-weight: 400;
+}
+
+.warning-msg {
+  margin: 0px 0 8px;
+  color: var(--greyColor)
+}
+
+.contents input {
+  display: block;
+  font-size: 14px;
+  border: none;
+  width: 100%;
+  padding: 2px;
+}
+
+input:focus {
+  outline: none;
+}
+
+.contents .save ul {
+  display: grid;
+  grid-template-columns: 1fr;
+  /* margin-bottom: 20px; */
+  grid-column-gap: 20px;
+  grid-row-gap: 30px;
+}
+
+.contents .phrases ul {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  /* margin-bottom: 20px; */
+  grid-column-gap: 25px;
+  grid-row-gap: 12px;
+}
+
+.contents .save ul li {
+  color: var(--blueColor);
+  font-size: 14px;
+  border-bottom: 1px solid rgb(224, 224, 224);
+  padding: 5px 0px;
+}
+
+
+.contents .phrases ul li {
+  color: var(--blueColor);
+  font-size: 14px;
+  border-bottom: 1px solid rgb(224, 224, 224);
+  padding: 5px 0px;
+}
+
+
+.contents .save ul li input {
+  color: var(--darkbg);
+  margin-left: 10px;
+}
+
+.contents .phrases ul li input {
+  color: var(--darkbg);
+  margin-left: 10px;
+}
+
+.stealth-link {
+  /* margin: 25px; */
+  font-size: 11px;
+  color: var(--blueColor);
+}
+
+.mnemonic-form a:not([href]) {
+  color: var(--blueColor);
+}
+
+.success-msg {
+  text-align: center;
+  font-size: 20px;
+  color: var(--greenColor);
+  margin-bottom: 50px;
+  margin-top: 50px;
+
+}
+
+.optional-area {
+  padding: 10px;
+  margin-top: 20px;
+  background-color: rgba(0, 0, 150, 0.1) !important;
+  border: 1px solid rgb(224, 224, 224);
+}
+</style>
\ No newline at end of file
diff --git a/app/src/components/wallets/wallet-card.vue b/app/src/components/wallets/wallet-card.vue
index a695009..df08aeb 100644
--- a/app/src/components/wallets/wallet-card.vue
+++ b/app/src/components/wallets/wallet-card.vue
@@ -1,10 +1,11 @@
 <template>
+  <div>
   <b-row
     v-if="wallet"
     class="wallet-card align-items-center mx-0"
-    @click="selectWallet"
+    @click.self="selectWallet"
   >
-    <b-col cols="3" class="pr-0">
+    <b-col cols="3" class="pr-0" @click="selectWallet">
       <b-avatar
         class="d-flex justify-content-center align-items-center"
         size="56px"
@@ -31,18 +32,33 @@
         {{ wallet.address }}
       </h6>
     </b-col>
+
     <b-col cols="2">
-      <img src="static/img/icons/delete.png" width="20px" class="delete" @click="deleteWallet"/>
+      <a
+        role="button"
+        data-toggle="modal"
+        data-target="#edit-form-topbar"
+      >
+      <img src="static/img/icons/kebab-c.png" width="8px" class="delete" />
+    </a>
+
     </b-col>
   </b-row>
+  <EditWalletForm
+    modalId="edit-form-topbar"
+  />
+</div>
 </template>
 
 <script>
 import { BAvatar, BRow, BCol } from 'bootstrap-vue';
 import util from '../../../static/js/util';
+import EditWalletForm from '@cmp/wallets/modals/edit-wallet';
+
 
 export default {
   components: {
+    EditWalletForm,
     BAvatar,
   },
   props: {
@@ -70,7 +86,19 @@ export default {
     },
   },
   data() {
-    return {};
+    return {
+      optionsArray: [
+    {
+      name: 'Add Star',
+      slug: 'add-star',
+      class: 'my-custom-class'
+    },
+    {
+      name: 'Remove Star',
+      slug: 'remove-star'
+    }
+  ]
+    };
   },
   methods: {
     selectWallet() {
@@ -93,8 +121,7 @@ export default {
         localStorage.setItem("wallet_list", wallet_list_tmp.join(","))
         window.location.reload();
       }
-    }
-
+    },
   },
 };
 </script>
diff --git a/app/src/components/wallets/wallets-list.vue b/app/src/components/wallets/wallets-list.vue
index b2eea18..b0993ab 100644
--- a/app/src/components/wallets/wallets-list.vue
+++ b/app/src/components/wallets/wallets-list.vue
@@ -99,11 +99,9 @@ export default {
       for (var wallet of this.list){
         this.contents[wallet.category].list.push(wallet);
       }
-      // console.log(this.contents)
     },
 
     expandDefault(){
-      console.log(this.$refs['accordion-body-uncategorised'])
       let el = this.$refs['accordion-body-uncategorised'][0];
       this.contents.uncategorised.active = true;
 
diff --git a/app/static/lang/en.js b/app/static/lang/en.js
index 2af0517..5a2051d 100644
--- a/app/static/lang/en.js
+++ b/app/static/lang/en.js
@@ -11,6 +11,7 @@ export default {
   webwallet_import: 'Import',
   webwallet_import_title: 'Import a Ki wallet',
   webwallet_create_title: 'Generate a Ki wallet',
+  webwallet_edit_title: 'Edit wallet',
   error_wallet_invalid: 'This wallet has not been imported properly and cannot be used. Please delete it from the wallet list and import it again.',
   warning_wallet_invalid_delete: 'Warning! Deleting this wallet will result in the loss of all it data from the Ki Desktop Wallet application.',
   transfer_modal_title: 'Make a Transfer',
@@ -29,6 +30,7 @@ export default {
   enter_wallet_name: 'Give a name to your wallet',
   multisig_wallet_true: 'Are you importing a multisignature account ?',
   offline_wallet:"Are you importing a watch only account ?",
+  wallet_category:"Pick a category for your wallet",
   error_mnemonic: 'Mnemonic phrase should be 24 words',
   error_password:
     'At least 8 characters, 1 uppercase, 1 lowercase and 1 number',

From 555063457c5cb9c0e43c628ab7a3ef0a7a608098 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Thu, 17 Dec 2020 16:34:13 +0100
Subject: [PATCH 06/23] Unify modals style

---
 app/src/components/transfer/modals/index.vue  | 13 +++++++++--
 .../wallets/modals/create-wallet.vue          | 18 ++++++++++-----
 .../wallets/modals/import-wallet.vue          | 20 +++++++++-------
 .../delegation/modals/delegate.modal.vue      | 23 ++++++++-----------
 .../delegation/modals/redelegate.modal.vue    | 14 +++++++----
 .../delegation/modals/undelegate.modal.vue    | 21 ++++++++---------
 .../withdraw/modals/withdraw-all.modal.vue    |  6 ++++-
 .../wallet/withdraw/modals/withdraw.modal.vue | 14 +++++++----
 8 files changed, 79 insertions(+), 50 deletions(-)

diff --git a/app/src/components/transfer/modals/index.vue b/app/src/components/transfer/modals/index.vue
index f86bdad..76807e5 100644
--- a/app/src/components/transfer/modals/index.vue
+++ b/app/src/components/transfer/modals/index.vue
@@ -1,11 +1,19 @@
 <template>
   <b-modal
     :id="modalId"
-    :title="$t('transfer_modal_title')"
     hide-footer
     @show="onResetModal"
   >
-    <div class="basic-form modal-body d-flex w-100">
+  <div class="basic-form modal-body">
+    <div class="modal-header" >
+      <h5 class="modal-title">
+        {{
+          $t('transfer_modal_title')
+        }}
+      </h5>
+    </div>
+    <div class="basic-form d-flex w-100">
+
       <!-- ========================Transfer form============================ -->
       <div id="transfer-form" class="tab-pane in active w-100">
         <form class="basic-form">
@@ -107,6 +115,7 @@
         </form>
       </div>
     </div>
+    </div>
   </b-modal>
 </template>
 
diff --git a/app/src/components/wallets/modals/create-wallet.vue b/app/src/components/wallets/modals/create-wallet.vue
index 89965aa..4a265ec 100644
--- a/app/src/components/wallets/modals/create-wallet.vue
+++ b/app/src/components/wallets/modals/create-wallet.vue
@@ -3,22 +3,28 @@
   <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 id="importTitle" class="modal-title">
+        <!-- <h5 id="importTitle" class="modal-title">
           {{ $t('webwallet_create_title') }}
-        </h5>
+        </h5> -->
         <button type="button" class="close" data-dismiss="modal" aria-label="Close" @click="onResetModal">
-          <span aria-hidden="true" style="color:white;">&times;</span>
+          <span aria-hidden="true" >&times;</span>
         </button>
       </div>
 
       <div class="basic-form modal-body">
+
         <div class="mnemonic-group">
+          <div class="modal-header" >
+             <h5 id="importTitle" class="modal-title">
+              {{ $t('webwallet_create_title') }}
+            </h5>
+          </div>
           <div class="mnemonic-form">
 
             <div v-if="step==0">
               <b-row style="margin-bottom:10px;">
                 <b-col cols="6">
-                  <h5>Wallet name</h5>
+                  <h6>Wallet name</h6>
                 </b-col>
                 <b-col />
               </b-row>
@@ -47,7 +53,7 @@
                 <b-col v-if="step==1 || step==2">
                   <b-row style="margin-bottom:10px;">
                     <b-col cols="6">
-                      <h5>Your mnemonic</h5>
+                      <h6>Your mnemonic</h6>
                     </b-col>
                     <b-col />
                     <b-col style="text-align:right" cols="4">
@@ -101,7 +107,7 @@
                 <b-col v-if="step==4">
                   <b-row style="margin-bottom:10px;">
                     <b-col cols="6">
-                      <h5>Wallet password</h5>
+                      <h6>Wallet password</h6>
                     </b-col>
                     <b-col />
                   </b-row>
diff --git a/app/src/components/wallets/modals/import-wallet.vue b/app/src/components/wallets/modals/import-wallet.vue
index dbdc87f..5781be5 100644
--- a/app/src/components/wallets/modals/import-wallet.vue
+++ b/app/src/components/wallets/modals/import-wallet.vue
@@ -3,23 +3,27 @@
   <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 id="importTitle" class="modal-title">
+        <!-- <h5 id="importTitle" class="modal-title">
           {{ $t('webwallet_import_title') }}
-        </h5>
+        </h5> -->
         <button type="button" class="close" data-dismiss="modal" aria-label="Close" @click="onResetModal">
-          <span aria-hidden="true" style="color:white;">&times;</span>
+          <span aria-hidden="true" >&times;</span>
         </button>
       </div>
 
       <div class="basic-form modal-body">
-        <!-- <img src="static/img/chain/kichain_banner.png"  style="width:70%" class="card-img-top"> -->
         <div class="mnemonic-group">
+          <div class="modal-header" >
+             <h5 id="importTitle" class="modal-title">
+              {{ $t('webwallet_import_title') }}
+            </h5>
+          </div>
           <div class="mnemonic-form">
 
             <div v-if="step==0">
               <b-row style="margin-bottom:10px;">
                 <b-col cols="6">
-                  <h5>Wallet name</h5>
+                  <h6>Wallet name</h6>
                 </b-col>
                 <b-col />
               </b-row>
@@ -39,7 +43,7 @@
 
               <b-row style="margin-bottom:10px;margin-top:20px;">
                 <b-col cols="6">
-                  <h5>Account type</h5>
+                  <h6>Account type</h6>
                 </b-col>
                 <b-col />
 
@@ -75,7 +79,7 @@
                 <b-col v-if="step==1 && !multisig && !offline_wallet">
                   <b-row style="margin-bottom:10px;">
                     <b-col cols="6">
-                      <h5>Your mnemonic</h5>
+                      <h6>Your mnemonic</h6>
                     </b-col>
                     <b-col />
                     <b-col style="text-align:right" cols="4">
@@ -138,7 +142,7 @@
                 <b-col v-if="step==2 && !multisig" >
                   <b-row style="margin-bottom:10px;">
                     <b-col cols="6">
-                      <h5>Wallet password</h5>
+                      <h6>Wallet password</h6>
                     </b-col>
                     <b-col />
                   </b-row>
diff --git a/app/src/views/wallet/delegation/modals/delegate.modal.vue b/app/src/views/wallet/delegation/modals/delegate.modal.vue
index c7bfe45..65f6a40 100644
--- a/app/src/views/wallet/delegation/modals/delegate.modal.vue
+++ b/app/src/views/wallet/delegation/modals/delegate.modal.vue
@@ -1,23 +1,18 @@
 <template>
   <b-modal :id="modalId" tabindex="-1" hide-footer @show="resetData">
-    <template v-slot:modal-title>
-      <h5 class="modal-title">
-        Delegate to
-        <strong :style="{ fontWeight: '600' }">{{
-          validator.description.moniker
-        }}</strong>
-      </h5>
-    </template>
     <div class="basic-form modal-body">
+      <div class="modal-header" >
+        <h5 class="modal-title">
+          Delegate to
+          <strong :style="{ fontWeight: '600' }">{{
+            validator.description.moniker
+          }}</strong>
+        </h5>
+      </div>
       <form class="basic-form">
         <li class="token">
-          <!-- <label class="mt-0">
-            <strong>{{ validator.description.moniker }}</strong> -
-            {{ formatAmount(validator.tokens) }}
-          </label> -->
           <div class="d-flex justify-content-start align-items-center">
-            <label class="m-0">To</label>
-            <b-badge variant="light" class="ml-2" :style="{ fontSize: '14px' }">
+            <b-badge variant="light" class="ml-0" :style="{ fontSize: '14px' }">
               {{ delegate.validator }}
             </b-badge>
           </div>
diff --git a/app/src/views/wallet/delegation/modals/redelegate.modal.vue b/app/src/views/wallet/delegation/modals/redelegate.modal.vue
index 90a6030..467d829 100644
--- a/app/src/views/wallet/delegation/modals/redelegate.modal.vue
+++ b/app/src/views/wallet/delegation/modals/redelegate.modal.vue
@@ -2,16 +2,22 @@
   <b-modal
     :id="modalId"
     tabindex="-1"
-    :title="'Redelegate'"
     hide-footer
     @show="resetData"
   >
     <div class="basic-form modal-body">
+      <div class="modal-header" >
+        <h5 class="modal-title">
+          Redelegate from
+          <strong :style="{ fontWeight: '600' }">{{
+            validator.description.moniker
+          }}</strong>
+        </h5>
+      </div>
       <form class="basic-form">
         <li class="token">
           <div class="d-flex justify-content-start align-items-center">
-            <label class="my-0">From</label>
-            <b-badge variant="light" class="ml-2" :style="{ fontSize: '14px' }">
+            <b-badge variant="light" class="ml-0" :style="{ fontSize: '14px' }">
               {{ redelegate.validator }}
             </b-badge>
           </div>
@@ -311,7 +317,7 @@ export default {
         }
 
         if (flag == 1){ //half
-          this.redelegate.amount = Number(Math.round(delegation / 2 + 'e6') + 'e-6') 
+          this.redelegate.amount = Number(Math.round(delegation / 2 + 'e6') + 'e-6')
         }
     }
   },
diff --git a/app/src/views/wallet/delegation/modals/undelegate.modal.vue b/app/src/views/wallet/delegation/modals/undelegate.modal.vue
index e5f60f3..be868ce 100644
--- a/app/src/views/wallet/delegation/modals/undelegate.modal.vue
+++ b/app/src/views/wallet/delegation/modals/undelegate.modal.vue
@@ -1,19 +1,18 @@
 <template>
   <b-modal :id="modalId" tabindex="-1" hide-footer @show="resetData">
-    <template v-slot:modal-title>
-      <h5 class="modal-title">
-        Undelegate from
-        <strong :style="{ fontWeight: '600' }">{{
-          validator.description.moniker
-        }}</strong>
-      </h5>
-    </template>
     <div class="basic-form modal-body">
+      <div class="modal-header" >
+        <h5 class="modal-title">
+          Undelegate from
+          <strong :style="{ fontWeight: '600' }">{{
+            validator.description.moniker
+          }}</strong>
+        </h5>
+      </div>
       <form class="basic-form">
         <li class="token">
           <div class="d-flex justify-content-start align-items-center">
-            <label class="m-0">From</label>
-            <b-badge variant="light" class="ml-2" :style="{ fontSize: '14px' }">
+            <b-badge variant="light" class="ml-0" :style="{ fontSize: '14px' }">
               {{ undelegate.validator }}
             </b-badge>
           </div>
@@ -310,7 +309,7 @@ export default {
         }
 
         if (flag == 1){ //half
-          this.undelegate.amount =  Number(Math.round(delegation / 2 + 'e6') + 'e-6') 
+          this.undelegate.amount =  Number(Math.round(delegation / 2 + 'e6') + 'e-6')
         }
     }
   },
diff --git a/app/src/views/wallet/withdraw/modals/withdraw-all.modal.vue b/app/src/views/wallet/withdraw/modals/withdraw-all.modal.vue
index 1d84e36..c8120bb 100644
--- a/app/src/views/wallet/withdraw/modals/withdraw-all.modal.vue
+++ b/app/src/views/wallet/withdraw/modals/withdraw-all.modal.vue
@@ -2,11 +2,15 @@
   <b-modal
     :id="modalId"
     tabindex="-1"
-    :title="`Withdraw all rewards`"
     hide-footer
     @show="resetData"
   >
     <div class="basic-form modal-body">
+      <div class="modal-header" >
+        <h5 class="modal-title">
+          Withdraw all rewards
+        </h5>
+      </div>
       <form class="basic-form">
         <div v-if="!multisig">
           <label>{{ $t('enter_password') }}</label>
diff --git a/app/src/views/wallet/withdraw/modals/withdraw.modal.vue b/app/src/views/wallet/withdraw/modals/withdraw.modal.vue
index 76969d1..bc02aa4 100644
--- a/app/src/views/wallet/withdraw/modals/withdraw.modal.vue
+++ b/app/src/views/wallet/withdraw/modals/withdraw.modal.vue
@@ -2,16 +2,22 @@
   <b-modal
     :id="modalId"
     tabindex="-1"
-    :title="`Withdraw from ${validator.description.moniker}`"
     hide-footer
     @show="resetData"
   >
     <div class="basic-form modal-body">
+      <div class="modal-header" >
+        <h5 class="modal-title">
+          Withdraw from
+          <strong :style="{ fontWeight: '600' }">{{
+            validator.description.moniker
+          }}</strong>
+        </h5>
+      </div>
       <form class="basic-form">
         <li class="token">
-          <div class="d-flex justify-content-center align-items-center">
-            From
-            <b-badge variant="light" class="ml-2" :style="{ fontSize: '14px' }">
+          <div class="d-flex justify-content-start align-items-center">
+            <b-badge variant="light" class="ml-0" :style="{ fontSize: '14px' }">
               {{ validator.operator_address }}
             </b-badge>
           </div>

From 7b9fe172e27ae1cab8e650b5f2715037b0975b30 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Fri, 18 Dec 2020 14:54:04 +0100
Subject: [PATCH 07/23] Add wallet categories P2

---
 app/src/App.vue                             |  22 ++-
 app/src/components/wallets/wallets-list.vue | 168 ++++++++++----------
 app/src/store/wallets/mutations.js          |   6 +-
 app/src/views/login/index.vue               |  35 ++--
 app/static/css/index.css                    |  10 +-
 5 files changed, 133 insertions(+), 108 deletions(-)

diff --git a/app/src/App.vue b/app/src/App.vue
index db14a6f..756bfe2 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -24,7 +24,8 @@ import {
 } from 'vuex';
 import {
   SET_WALLETS_LIST,
-  SET_WALLETS_DICT
+  SET_WALLETS_DICT,
+  SET_CATEGORY_LIST
 } from '@store/wallets';
 import {
   SET_ACCOUNT
@@ -92,12 +93,17 @@ export default {
     };
     bootstrap();
   },
-  mounted() {},
+  mounted() {
+    this.getCategories();
+
+  },
   methods: {
     ...mapMutations({
       setWalletsList: SET_WALLETS_LIST,
       setWalletsDict: SET_WALLETS_DICT,
       setAccount: SET_ACCOUNT,
+      setCategoryList: SET_CATEGORY_LIST,
+
     }),
     ...mapActions({
       fetchValidatorsList: FETCH_VALIDATORS_LIST,
@@ -126,6 +132,16 @@ export default {
         res(1);
       });
     },
+    getCategories(){
+      let categories = [];
+      if (localStorage.getItem('categories')) {
+        categories = localStorage.getItem('categories').split(',');
+      }else{
+        categories =  ['personal','work','multisignature']
+        localStorage.setItem('categories', categories);
+      }
+      this.setCategoryList(categories);
+    },
     getAccounts() {
       return new Promise(res => {
         if (localStorage.getItem('wallet_list')) {
@@ -165,7 +181,7 @@ export default {
                   ms: lse_temp.ms,
                   offline: lse_temp.offline,
                   invalid: lse_temp.invalid,
-                  category: lse_temp.category != undefined ? lse_temp.category : "uncategorised"
+                  category: lse_temp.category != undefined ? lse_temp.category : "uncategorized"
                 }
 
                 if (wallet_tmp.ms) {
diff --git a/app/src/components/wallets/wallets-list.vue b/app/src/components/wallets/wallets-list.vue
index b0993ab..0d8a5b3 100644
--- a/app/src/components/wallets/wallets-list.vue
+++ b/app/src/components/wallets/wallets-list.vue
@@ -2,25 +2,25 @@
 <div>
   <b-row v-if="list.length" class="w-100 mx-0 pl-3">
     <div class="accordion">
-      <div class="accordion-item" v-for="(content, i) in contents" v-bind:key="i" v-bind:class="{ 'accordion-active': content.active }">
+      <div class="accordion-item" v-for="(content, i) in categories" v-bind:key="i" v-bind:class="{ 'accordion-active': content.active }">
         <div v-if="content.list.length != 0">
-        <div class="accordion-header">
-          <a href="#" v-on:click="expand(i)">
-            <div class="accordion-header-div">{{ content.title }}</div>
-            <div class="accordion-header-div">
-              <div class="accordion-caret" />
-            </div>
-          </a>
-        </div>
-        <div class="accordion-body" v-bind:ref="'accordion-body-' + i">
-          <b-row class="w-100 mx-0 pl-3">
-            <b-col v-for="(wallet, index) in content.list" :key="index" cols="4" :class="[
+          <div class="accordion-header">
+            <a href="#" v-on:click="expand(i)">
+              <div class="accordion-header-div">{{ content.title }}</div>
+              <div class="accordion-header-div">
+                <div class="accordion-caret" />
+              </div>
+            </a>
+          </div>
+          <div class="accordion-body" v-bind:ref="'accordion-body-' + i">
+            <b-row class="w-100 mx-0 pl-3">
+              <b-col v-for="(wallet, index) in content.list" :key="index" cols="4" :class="[
                 'mb-3 pl-0 pr-3',
               ]">
-              <WalletCard :wallet="wallet" @onSelectWallet="onSelectWallet" />
-            </b-col>
-          </b-row>
-        </div>
+                <WalletCard :wallet="wallet" @onSelectWallet="onSelectWallet" />
+              </b-col>
+            </b-row>
+          </div>
 
         </div>
       </div>
@@ -41,7 +41,9 @@ import {
 } from 'bootstrap-vue';
 import WalletCard from '@cmp/wallets/wallet-card';
 // import WalletAcc from '@cmp/wallets/wallets-accordion';
-import {  mapState } from 'vuex';
+import {
+  mapState
+} from 'vuex';
 import gsap from 'gsap'
 
 export default {
@@ -57,53 +59,41 @@ export default {
   computed: {
     ...mapState({
       list: state => state.wallets.list,
+      categories_raw: state => state.wallets.categories,
     }),
-    contents() {
-      return {
-        personal: {
-        title: 'Personal',
-        description: 'Personal wallets',
-        active: false,
-        list: [],
-      },
-      work:{
-        title: 'Work',
-        description: 'Work wallets',
-        active: false,
-        list: [],
-      },
-      multisig: {
-        title: 'Multisig',
-        description: 'Multisig wallets',
-        active: false,
-        list: [],
-      },
-      uncategorised: {
-        title: 'Uncategorised',
-        description: 'Other wallets',
-        active: false,
-        list: [],
+    categories() {
+      var categories_ = {}
+      for (var cat of this.categories_raw) {
+        categories_[cat] = {
+          title: cat,
+          active: false,
+          list: [],
+        }
       }
-    }
+      return categories_;
     }
   },
   created() {
     this.splitCategories();
   },
-  mounted(){
+  mounted() {
     this.expandDefault();
-
   },
   methods: {
-    splitCategories(){
-      for (var wallet of this.list){
-        this.contents[wallet.category].list.push(wallet);
+    splitCategories() {
+      for (var wallet of this.list) {
+        if(wallet.category!=undefined){
+          this.categories[wallet.category].list.push(wallet);
+        }
+        else{
+          this.categories["uncategorized"].list.push(wallet);
+        }
       }
     },
 
-    expandDefault(){
-      let el = this.$refs['accordion-body-uncategorised'][0];
-      this.contents.uncategorised.active = true;
+    expandDefault() {
+      let el = this.$refs['accordion-body-'+Object.keys(this.categories)[0]][0];
+      this.categories[Object.keys(this.categories)[0]].active = true;
 
       gsap.to(el, 1, {
         height: el.scrollHeight,
@@ -114,15 +104,15 @@ export default {
       event.preventDefault();
 
       let el = this.$refs['accordion-body-' + i][0];
-      if (this.contents[i].active === false) {
-        this.contents[i].active = true;
+      if (this.categories[i].active === false) {
+        this.categories[i].active = true;
 
         gsap.to(el, 1, {
           height: el.scrollHeight,
           ease: "elastic(1, 0.9)"
         });
       } else {
-        this.contents[i].active = false;
+        this.categories[i].active = false;
 
         gsap.to(el, 0.5, {
           height: 0,
@@ -142,35 +132,36 @@ export default {
 .accordion-item,
 .accordion-header,
 .accordion-body {
-	font-family: inherit;
+  font-family: inherit;
 }
 
 .accordion {
-	/* background-color: #ffffff; */
-	width: 100%;
-	max-height: 100%;
-	/* max-width: 320px;  */
-	padding: 2rem 1rem;
-	margin: auto;
-	box-sizing: border-box;
-	overflow: auto;
-	/* box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.3); */
+  /* background-color: #ffffff; */
+  width: 100%;
+  max-height: 100%;
+  /* max-width: 320px;  */
+  padding: 2rem 1rem;
+  margin: auto;
+  box-sizing: border-box;
+  overflow: auto;
+  /* box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.3); */
 }
 
 .accordion-item.accordion-active.accordion-caret {
-		animation: accordion-is-active 200ms linear forwards;
+  animation: accordion-is-active 200ms linear forwards;
 }
 
 .accordion-header {
-	color: inherit;
-	font-size: 1.2rem;
-	font-weight: bold;
-	position: relative;
+  color: inherit;
+  font-size: 1.2rem;
+  font-weight: bold;
+  position: relative;
 
 }
 
 .accordion-header a {
-  color: inherit;
+  text-transform: capitalize;
+  color: #2d1d67;
   text-decoration: none;
   width: 100%;
   height: 100%;
@@ -181,12 +172,13 @@ export default {
   transition: background-color 200ms ease-in-out;
 
 }
+
 .accordion-header a:not(.accordion-active):hover {
   /* background-color: #d8d2ef8f; */
 }
 
 .accordion-header-div {
-	padding: 1rem 1rem 1rem 1rem;
+  padding: 1rem 1rem 1rem 1rem;
 }
 
 .accordion-header-div:last-child {
@@ -196,7 +188,7 @@ export default {
   justify-content: center;
 }
 
-.accordion-caret {
+/* .accordion-caret {
 	background-image: linear-gradient(
   	to top right,
   	transparent 50%,
@@ -206,18 +198,18 @@ export default {
 	height: 0.5rem;
 	transform: rotate(-45deg);
 	animation: accordion-is-inactive 200ms linear forwards;
-}
+} */
 
 .accordion-body {
-	height: 0;
-	overflow: hidden;
+  height: 0;
+  overflow: hidden;
 }
 
 .accordion-content {
-	padding: 1rem;
+  padding: 1rem;
 }
 
-@keyframes accordion-is-inactive {
+/* @keyframes accordion-is-inactive {
 	0%   { transform: rotate(-45deg); }
 	50%  { transform: scale(1.5) rotate(45deg); }
 	100% { transform: rotate(135deg); }
@@ -227,17 +219,17 @@ export default {
 	0%   { transform: rotate(135deg); }
 	50%  { transform: scale(1.5) rotate(45deg); }
 	100% { transform:  rotate(-45deg); }
-}
+} */
 
 @media screen and (min-width: var(--base-width) {
-	#app {
-		padding: 2rem;
-		overflow: auto;
-	}
-
-	.accordion {
-		max-height: none;
-		border-radius: 0.5rem;
-	}
-}
+    #app {
+      padding: 2rem;
+      overflow: auto;
+    }
+
+    .accordion {
+      max-height: none;
+      border-radius: 0.5rem;
+    }
+  }
 </style>
diff --git a/app/src/store/wallets/mutations.js b/app/src/store/wallets/mutations.js
index 9f00d63..e3afc29 100644
--- a/app/src/store/wallets/mutations.js
+++ b/app/src/store/wallets/mutations.js
@@ -6,6 +6,7 @@ export const SET_CURRENT_WALLET_TX = 'SET_CURRENT_WALLET_TX';
 
 export const SET_WALLETS_LIST = 'SET_WALLETS_LIST';
 export const SET_WALLETS_DICT = 'SET_WALLETS_DICT';
+export const SET_CATEGORY_LIST = 'SET_CATEGORY_LIST';
 export const START_HYDRATE = 'START_HYDRATE';
 export const END_HYDRATE = 'END_HYDRATE';
 
@@ -31,13 +32,16 @@ export const mutations = {
       rewards,
     };
   },
-  
+
   [SET_WALLETS_LIST](state, walletsList) {
     state.wallets.list = walletsList;
   },
   [SET_WALLETS_DICT](state, walletsdict) {
     state.wallets.dict = walletsdict;
   },
+  [SET_CATEGORY_LIST](state, catdict) {
+    state.wallets.categories = catdict;
+  },
   [START_HYDRATE](state) {
     state.wallets.loading = true;
   },
diff --git a/app/src/views/login/index.vue b/app/src/views/login/index.vue
index ff6cae6..24d79e1 100644
--- a/app/src/views/login/index.vue
+++ b/app/src/views/login/index.vue
@@ -113,7 +113,7 @@ import ImportWalletForm from '@cmp/wallets/modals/import-wallet';
 import CreateWalletForm from '@cmp/wallets/modals/create-wallet';
 import { mapMutations } from 'vuex';
 import { SET_ACCOUNT } from '@store/account';
-import { SET_CURRENT_WALLET, SET_WALLETS_LIST, SET_WALLETS_DICT } from '@store/wallets';
+import { SET_CURRENT_WALLET, SET_WALLETS_LIST, SET_WALLETS_DICT, SET_CATEGORY_LIST} from '@store/wallets';
 
 export default {
   components: {
@@ -150,7 +150,8 @@ export default {
   },
 
   mounted() {
-    this.getwallets();
+    // this.getwallets();
+    this.getCategories();
   },
 
   methods: {
@@ -159,6 +160,7 @@ export default {
       setCurrentWallet: SET_CURRENT_WALLET,
       setWalletsList: SET_WALLETS_LIST,
       setWalletsDict: SET_WALLETS_DICT,
+      setCategoryList: SET_CATEGORY_LIST,
     }),
     getChain() {
       if (this.blockchain) {
@@ -265,16 +267,27 @@ export default {
       this.password_correct = true;
     },
 
-    getwallets() {
-      if (localStorage.getItem('wallet_list')) {
-        let wallet_list = localStorage.getItem('wallet_list').split(',');
-        for (var w in wallet_list) {
-          this.wallets.push([
-            wallet_list[w],
-            JSON.parse(localStorage.getItem(wallet_list[w])).address,
-          ]);
-        }
+    // getwallets() {
+    //   if (localStorage.getItem('wallet_list')) {
+    //     let wallet_list = localStorage.getItem('wallet_list').split(',');
+    //     for (var w in wallet_list) {
+    //       this.wallets.push([
+    //         wallet_list[w],
+    //         JSON.parse(localStorage.getItem(wallet_list[w])).address,
+    //       ]);
+    //     }
+    //   }
+    // },
+
+    getCategories(){
+      let categories = 'personal,work,multisignature';
+      if (localStorage.getItem('categories')) {
+        categories = localStorage.getItem('categories').split(',');
+      }else{
+        // categories = 'personal,work,uncategorized'
+        localStorage.setItem('categories', 'personal,work,multisignature');
       }
+      setCategoryList(categories);
     },
 
     login() {
diff --git a/app/static/css/index.css b/app/static/css/index.css
index c57265b..caf477f 100644
--- a/app/static/css/index.css
+++ b/app/static/css/index.css
@@ -808,18 +808,18 @@ a.custom-card:hover {
 }
 
 .modal-title {
-  color: #fff;
-  font-weight: 300;
+  color: var(--textColor);
 }
 
 .modal-header {
   font-size: 12px;
-  color: #fff;
-  background-color: var(--primary);
-  /* background-color: var(--pale-grey);  */
+  color: var(--primary);
+  background-color: #fff;
   border-bottom: 0px solid #dee2e6;
   border-top-left-radius: 0.3rem;
   border-top-right-radius: 0.3rem;
+  padding: 5px 10px 10px 0;
+
 }
 
 .modal-content {

From d2e0d9cdd1ace6dc291ab705e9a5101c08fd17cf Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Fri, 18 Dec 2020 14:54:35 +0100
Subject: [PATCH 08/23] Added wallet edit modal P2

---
 .../components/wallets/modals/edit-wallet.vue | 178 +++++++++---------
 app/src/components/wallets/wallet-card.vue    |  17 +-
 2 files changed, 98 insertions(+), 97 deletions(-)

diff --git a/app/src/components/wallets/modals/edit-wallet.vue b/app/src/components/wallets/modals/edit-wallet.vue
index 4c6f328..d4c9923 100644
--- a/app/src/components/wallets/modals/edit-wallet.vue
+++ b/app/src/components/wallets/modals/edit-wallet.vue
@@ -4,16 +4,20 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close" @click="onResetModal">
-          <span aria-hidden="true" >&times;</span>
+          <span aria-hidden="true">&times;</span>
         </button>
       </div>
 
       <div class="basic-form modal-body">
         <div class="mnemonic-group">
-          <div class="modal-header" >
-             <h5 id="importTitle" class="modal-title">
+          <div class="modal-header">
+            <h5 id="importTitle" class="modal-title">
               {{ $t('webwallet_edit_title') }}
+              <strong :style="{ fontWeight: '600' }">{{
+                wallet.account
+              }}</strong>
             </h5>
+            <img src="static/img/icons/delete.png" width="28px" class="delete" @click="deleteWallet" />
           </div>
           <div class="mnemonic-form">
             <div v-if="step==0">
@@ -26,7 +30,7 @@
               <b-row style="margin-bottom:20px;">
                 <b-col>Change the name of wallet </b-col>
               </b-row>
-              <input v-model="wallet_name" type="text" @input="
+              <input v-model="new_wallet_name" type="text" @input="
                     validateWalltName();
                     validateWalltNameExist();
                   " />
@@ -46,35 +50,17 @@
               <b-row style="margin-bottom:15px;" align-v="center">
                 <b-col cols="10">{{ $t('wallet_category') }}</b-col>
               </b-row>
-              <b-button v-for="(btn, idx) in buttons" size="sm" :key="idx" :pressed="filter === btn.filter" variant="outline-primary" style="margin-right:5px;margin-top:5px;" @click="btn.onPress(btn.filter)">
-                {{ btn.caption }}
+              <b-button v-for="(cat, idx) in categories" size="sm" :key="idx" :pressed="filter === cat" variant="outline-primary" style="margin-right:5px;margin-top:5px;" @click="handleCat(cat)">
+                {{ cat }}
               </b-button>
-
-              <b-row style="margin-bottom:10px;margin-top:20px;">
-                <b-col cols="10">
-                  <h6>Delete this wallet</h6>
-                </b-col>
-                <b-col />
-              </b-row>
-
-              <b-row style="margin-bottom:20px;">
-                <b-col>Enter the name of the wallet you want to delete to confirm </b-col>
-              </b-row>
-              <input v-model="wallet_name" type="text" @input="
-                    validateWalltName();
-                    validateWalltNameExist();
-                  "
-                  class="danger"/>
-                </div>
+            </div>
           </div>
           <div style="margin-bottom:20px">
             <div class="mnemonic-form">
               <b-row>
-                <!-- Main button warning section -->
                 <b-col>
-                  <!-- Main button -->
                   <div class="d-flex justify-content-center">
-                    <button class="btn btn-primary" @click="proceed" :disabled="!disabled">
+                    <button class="btn btn-primary" @click="updateWallet" :disabled="!disabled">
                       <span>{{$t(workflow[step])}}</span>
                     </button>
                   </div>
@@ -95,6 +81,7 @@ import {
   BCol,
   BButton,
 } from 'bootstrap-vue';
+import {  mapState } from 'vuex';
 
 export default {
   components: {
@@ -107,80 +94,44 @@ export default {
       type: String,
       default: 'modalId',
     },
+    wallet: {
+      type: Object,
+      default: null,
+    }
   },
+
   data() {
     return {
       workflow: ['Save'],
       step: 0,
-      filter: 'u',
-      wallet_name: '',
+      new_wallet_name: this.wallet.account,
+      new_wallet_categroy: this.wallet.category,
+      filter: this.wallet.category,
       name_exists: false,
       name_correct: true,
-      disabled: false,
-
-      buttons: [
-        {
-          caption: 'Personal',
-          onPress: this.handleCat,
-          filter: 'p',
-        },
-        {
-          caption: 'Work',
-          onPress: this.handleCat,
-          filter: 'w',
-        },
-        {
-          caption: 'Multisignature',
-          onPress: this.handleCat,
-          filter: 'm',
-        },
-        {
-            caption: 'Uncategorized',
-            onPress: this.handleCat,
-            filter: 'u',
-          },
-      ],
+      disabled: true,
+      wallet_name_to_delete: '',
     };
   },
+  computed:{
+    ...mapState({
+      categories:  state => state.wallets.categories,
+    }),
+  },
   methods: {
     onResetModal() {
       this.step = 0;
-      this.filter = 'u';
-      this.mnemonic = '';
-      this.ms_address = '';
-      this.wallet_name = '';
-      this.offline_address ='';
-      this.wallet_pass_tmp = '';
-      this.disabled = false;
-      this.multisig = false;
+      this.new_wallet_name = this.wallet.account;
+      this.new_wallet_categroy = this.wallet.category;
+      this.disabled = true;
       this.name_exists = false;
       this.name_correct = true;
     },
-    validatePassword() {
-      if (!this.wallet_pass_tmp) {
-        this.password_correct = false;
-      } else {
-        var ok_password = new RegExp(
-          '^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.{8,})',
-        );
-        if (!ok_password.test(this.wallet_pass_tmp)) {
-          this.password_correct = false;
-        } else {
-          this.password_correct = true;
-        }
-      }
-      this.disabled = this.password_correct
-
-    },
-    toggletPasswordVisible() {
-      this.password_visible = !this.password_visible;
-    },
-
     validateWalltName() {
-      if (!this.wallet_name) {
+      if (!this.new_wallet_name) {
         this.name_correct = false;
       } else {
-        if (this.wallet_name.match(/[^\w\.\-]/)) {
+        if (this.new_wallet_name.match(/[^\w\.\-]/)) {
           this.name_correct = false;
         } else {
           this.name_correct = true;
@@ -190,24 +141,59 @@ export default {
 
     },
     validateWalltNameExist() {
-      let wallet_list = this.wallet_name;
+      let wallet_list = this.new_wallet_name;
 
-      if (localStorage.getItem('wallet_list')) {
-        let wallet_list_old = localStorage.getItem('wallet_list').split(',');
-        if (wallet_list_old.includes(wallet_list)) {
-          this.name_exists = true;
-        } else {
-          this.name_exists = false;
+      if (wallet_list == this.wallet.account){
+        this.name_exists = false;
+      }else{
+        if (localStorage.getItem('wallet_list')) {
+          let wallet_list_old = localStorage.getItem('wallet_list').split(',');
+          if (wallet_list_old.includes(wallet_list)) {
+            this.name_exists = true;
+          } else {
+            this.name_exists = false;
+          }
         }
       }
+
       this.disabled = this.name_correct && !this.name_exists;
     },
+    handleCat(cat) {
+      this.filter = cat;
+      this.new_wallet_categroy = cat;
+    },
+    updateWallet() {
+      var updated_wallet = JSON.parse(localStorage.getItem(this.wallet.account))
+
+      if (this.new_wallet_categroy != this.wallet.category){
+        updated_wallet["category"]= this.new_wallet_categroy
+      }
+
+      localStorage.setItem(this.new_wallet_name, JSON.stringify(updated_wallet))
 
-    async proceed(e) {
+      if (this.new_wallet_name != this.wallet.account){
+        localStorage.removeItem(this.wallet.account)
+        localStorage.setItem("wallet_list", localStorage.getItem("wallet_list").replace(","+this.wallet.account+",",","+this.new_wallet_name+","))
+      }
+      this.$emit('onUpdateSuccess');
     },
+    deleteWallet() {
+      console.log(this.wallet)
+      if (confirm("Do you really want to delete " + this.wallet.account + " ?")) {
+        localStorage.removeItem(this.wallet.account)
+        var wallet_list_tmp = (localStorage.getItem("wallet_list")) ? localStorage.getItem("wallet_list").split(',') : '';
+        var index = wallet_list_tmp.indexOf(this.wallet.account);
 
-    handleCat(cat) {
-        this.filter = cat;
+        if (index > -1) {
+          wallet_list_tmp.splice(index, 1);
+        }
+        if (wallet_list_tmp.length == 0) {
+          localStorage.setItem("identity_kichain", "")
+          localStorage.setItem("current_wallet", "")
+        }
+        localStorage.setItem("wallet_list", wallet_list_tmp.join(","))
+        window.location.reload();
+      }
     },
   },
 };
@@ -313,4 +299,12 @@ input:focus {
   background-color: rgba(0, 0, 150, 0.1) !important;
   border: 1px solid rgb(224, 224, 224);
 }
+
+.delete {
+  opacity: 0.2
+}
+
+.delete:hover {
+  opacity: 0.5
+}
 </style>
\ No newline at end of file
diff --git a/app/src/components/wallets/wallet-card.vue b/app/src/components/wallets/wallet-card.vue
index df08aeb..c3d1862 100644
--- a/app/src/components/wallets/wallet-card.vue
+++ b/app/src/components/wallets/wallet-card.vue
@@ -37,15 +37,17 @@
       <a
         role="button"
         data-toggle="modal"
-        data-target="#edit-form-topbar"
+        :data-target="'#edit-form-'+wallet.account"
       >
-      <img src="static/img/icons/kebab-c.png" width="8px" class="delete" />
+      <img src="static/img/icons/kebab-c.png" width="8px" class="more" />
     </a>
 
     </b-col>
   </b-row>
   <EditWalletForm
-    modalId="edit-form-topbar"
+    :modalId="'edit-form-'+wallet.account"
+    :wallet="wallet"
+    @onUpdateSuccess="handleUpdateSucces"
   />
 </div>
 </template>
@@ -104,7 +106,12 @@ export default {
     selectWallet() {
       this.$emit('onSelectWallet', this.wallet);
     },
+    handleUpdateSucces(){
+      console.log("asd")
+      this.$bvModal.hide('#edit-form-'+this.wallet.account);
+      window.location.reload();
 
+    },
     deleteWallet(){
       if(confirm("Do you really want to delete " + this.wallet.account+ " ?") ) {
         localStorage.removeItem(this.wallet.account)
@@ -142,11 +149,11 @@ export default {
   transform: scale(1.01);
 }
 
-.delete{
+.more{
   opacity:0.2
 }
 
-.delete:hover{
+.more:hover{
   opacity:0.5
 }
 </style>

From 6a4d5da0a7d648fff4d9d3a1febd68e548230e27 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Fri, 18 Dec 2020 15:41:22 +0100
Subject: [PATCH 09/23] [Sign] Added autofill for onbehalf

---
 app/src/views/wallet/sign/index.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/views/wallet/sign/index.vue b/app/src/views/wallet/sign/index.vue
index f273b56..51d9fec 100644
--- a/app/src/views/wallet/sign/index.vue
+++ b/app/src/views/wallet/sign/index.vue
@@ -26,7 +26,7 @@
           disabled
         />
       </li>
-      <li class="token">
+      <li class="token" v-if="sign.onbehalf != account.id">
         <label>{{ $t('webwallet_sign_onbehalf') }}</label>
         <input
           v-model="sign.onbehalf"
@@ -164,6 +164,7 @@ export default {
         switch (msg_[0].type) {
           case 'cosmos-sdk/MsgSend':
             var msg = msg_[0];
+            this.sign.onbehalf=msg.value.from_address;
             return (
               'Send:\t ' +
               msg.value.amount[0].amount / Math.pow(10, 6) +
@@ -176,6 +177,7 @@ export default {
 
           case 'cosmos-sdk/MsgDelegate':
             var msg = msg_[0];
+            this.sign.onbehalf=msg.value.delegator_address;
             return (
               'Delegate:\t ' +
               msg.value.amount.amount / Math.pow(10, 6) +
@@ -188,6 +190,7 @@ export default {
 
           case 'cosmos-sdk/MsgUndelegate':
             var msg = msg_[0];
+            this.sign.onbehalf=msg.value.delegator_address;
             return (
               'Unbond:\t ' +
               msg.value.amount.amount / Math.pow(10, 6) +
@@ -198,6 +201,7 @@ export default {
 
           case 'cosmos-sdk/MsgBeginRedelegate':
             var msg = msg_[0];
+            this.sign.onbehalf=msg.value.delegator_address;
             return (
               'Redelagate:\t ' +
               msg.value.amount.amount / Math.pow(10, 6) +
@@ -210,6 +214,7 @@ export default {
 
           case 'cosmos-sdk/MsgWithdrawDelegationReward':
             var msg = msg_[0];
+            this.sign.onbehalf=msg.value.delegator_address;
             var output = 'Withdraw rewards ';
             if (!(msg_[1] === undefined)) {
               if (msg_[1].type == 'cosmos-sdk/MsgWithdrawValidatorCommission') {
@@ -222,6 +227,7 @@ export default {
 
           case 'cosmos-sdk/MsgWithdrawValidatorCommission':
             var msg = msg_[0];
+            this.sign.onbehalf=this.account.id;
             var output = 'Withdraw commissions';
             if (!(msg_[1] === undefined)) {
               if (msg_[1].type == 'cosmos-sdk/MsgWithdrawValidatorCommission') {

From 89fa680dc3e23dfa8f73d9cd0da71d8da619050b Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Fri, 18 Dec 2020 17:00:23 +0100
Subject: [PATCH 10/23] Added global USD price computation

---
 .../topbar/no-wallet-actions.vue              | 42 +++++++++++++++----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/app/src/components/private-layout/topbar/no-wallet-actions.vue b/app/src/components/private-layout/topbar/no-wallet-actions.vue
index 0485eef..e0ca9f5 100644
--- a/app/src/components/private-layout/topbar/no-wallet-actions.vue
+++ b/app/src/components/private-layout/topbar/no-wallet-actions.vue
@@ -1,15 +1,36 @@
 <template>
   <div class="d-flex w-100 h-100 justify-content-between align-items-center">
-    <div>
-      <h4>
-        <span v-if="!loadingWallet">Total Balance
-          <h6>  {{ globalData.kichain.token }} {{total}}</h6>
-        </span>
-        <span v-else>
-          <b-spinner type="grow" variant="light" />
-        </span>
-      </h4>
+    <div class="d-flex justify-content-center flex-column ml-3" v-if="!loadingWallet">
+      <h5>Total Balance</h5>
+      <h5 :style="{ fontWeight: 'bolder' }">
+        {{ globalData.kichain.token }} {{total}}
+      </h5>
+      <p
+        :style="{
+          color: 'var(--secondary)',
+          fontSize: '0.9rem',
+          fontWeight: '600',
+        }"
+      >
+
+      $ {{total_usd}} . $ {{ token_price }}/{{ globalData.kichain.token }}
+      </p>
+
+
     </div>
+    <span v-else>
+      <b-spinner type="grow" variant="light" />
+    </span>
+    <!-- <div>
+      <h5>
+        <span> Total Balance </span>
+        <span v-if="!loadingWallet">
+          <h4> <span> {{ globalData.kichain.token }} {{total}}</span></h4>
+          <h6> USD  ~ {{total_usd}}</h6>
+        </span>
+
+      </h5>
+    </div> -->
     <div class="d-flex flex-row">
       <div class="pr-4">
         <a
@@ -83,6 +104,8 @@ export default {
       network: '',
       token: '',
       total:0,
+      total_usd:0,
+      token_price:0.06
     };
   },
   mounted() {
@@ -203,6 +226,7 @@ export default {
         }
       }
 
+      this.total_usd = tokenUtil.format(total * this.token_price);
       this.total = tokenUtil.format(total)
     }
   },

From fda5c770ee023d93e113d81ffcc6dc24924cd490 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Fri, 18 Dec 2020 17:13:42 +0100
Subject: [PATCH 11/23] Added wallet USD balance computation

---
 .../private-layout/topbar/wallet-actions.vue  | 141 ++++++++++--------
 app/src/main.js                               |   2 +
 app/static/img/icons/copy.png                 | Bin 0 -> 8116 bytes
 3 files changed, 78 insertions(+), 65 deletions(-)
 create mode 100644 app/static/img/icons/copy.png

diff --git a/app/src/components/private-layout/topbar/wallet-actions.vue b/app/src/components/private-layout/topbar/wallet-actions.vue
index 668fa49..f91085b 100644
--- a/app/src/components/private-layout/topbar/wallet-actions.vue
+++ b/app/src/components/private-layout/topbar/wallet-actions.vue
@@ -1,89 +1,89 @@
 <template>
-  <div class="d-flex w-100 h-100 justify-content-between align-items-center">
-    <div class="d-flex flex-row">
-      <div class="d-flex justify-content-center align-items-center">
-        <a
-          v-b-modal="'info-modal'"
-          class="d-flex flex-column align-items-center justify-content-center"
-        >
-        <b-avatar
-          class="d-flex justify-content-center align-items-center"
-          size="3.5rem"
-          variant="light"
-          :style="{
+<div class="d-flex w-100 h-100 justify-content-between align-items-center">
+  <div class="d-flex flex-row">
+    <div class="d-flex justify-content-center align-items-center">
+      <a v-b-modal="'info-modal'" class="d-flex flex-column align-items-center justify-content-center">
+        <b-avatar class="d-flex justify-content-center align-items-center" size="3.5rem" variant="light" :style="{
             color: 'white',
             backgroundImage: currentWallet.bgImageStyle,
-          }"
-          :text="currentWallet.account[0].toUpperCase()"
-        />
+          }" :text="currentWallet.account[0].toUpperCase()" />
       </a>
 
+    </div>
+    <div class="d-flex justify-content-center flex-column ml-3">
+      <a v-if="!show_add" @click="show_add=!show_add">
+      <h5 >{{ currentWallet.account }}</h5>
+    </a>
+      <div v-else>
+        <a  @click="show_add=!show_add">
+        <h6 style=" display: inline;">
+          {{ currentWallet.address }}
+        </h6>
+      </a>
+      <img type="button" v-clipboard:copy="currentWallet.address" src="static/img/icons/copy.png" width="15px" class="copy" />
+
       </div>
-      <div class="d-flex justify-content-center flex-column ml-3">
-        <h5>{{ currentWallet.account }}</h5>
-        <p
-          :style="{
+
+      <h5 :style="{ fontWeight: 'bolder' }">
+        {{ globalData.kichain.token }}
+        {{ currentWalletBalancesAmount.available }}
+      </h5>
+      <p :style="{
             color: 'var(--secondary)',
-            fontSize: '0.85rem',
+            fontSize: '0.9rem',
             fontWeight: '600',
-          }"
-        >
-          {{ currentWallet.address }}
-        </p>
-        <h5 :style="{ fontWeight: 'bolder' }">
-          {{ globalData.kichain.token }}
-          {{ currentWalletBalancesAmount.available }}
-        </h5>
-      </div>
+          }">
+
+        $ {{total_usd}} . $ {{ token_price }}/{{ globalData.kichain.token }}
+      </p>
     </div>
+  </div>
 
 
-    <div class="d-flex flex-row">
-      <div class="pr-4">
-        <a
-          role="button"
-          data-toggle="modal"
-          data-target="#add-form-topbar"
-          class="d-flex flex-column align-items-center justify-content-center"
-          @click="handleRefresh"
-        >
-          <unicon
-            name="sync"
-            :class="[refreshing ? 'rotating' : '']"
-            :fill="colors.secondary"
-          />
-          <span class="mt-2" :style="{ fontWeight: '500' }">Refresh</span>
-        </a>
-      </div>
-      <div class="border-left pl-4">
-        <a
-          v-b-modal="'transfer-modal'"
-          class="d-flex flex-column align-items-center justify-content-center"
-        >
-          <unicon name="exchange" :fill="colors.secondary" />
-          <span class="mt-2" :style="{ fontWeight: '500' }">Transfer</span>
-        </a>
-      </div>
+  <div class="d-flex flex-row">
+    <div class="pr-4">
+      <a role="button" data-toggle="modal" data-target="#add-form-topbar" class="d-flex flex-column align-items-center justify-content-center" @click="handleRefresh">
+        <unicon name="sync" :class="[refreshing ? 'rotating' : '']" :fill="colors.secondary" />
+        <span class="mt-2" :style="{ fontWeight: '500' }">Refresh</span>
+      </a>
+    </div>
+    <div class="border-left pl-4">
+      <a v-b-modal="'transfer-modal'" class="d-flex flex-column align-items-center justify-content-center">
+        <unicon name="exchange" :fill="colors.secondary" />
+        <span class="mt-2" :style="{ fontWeight: '500' }">Transfer</span>
+      </a>
     </div>
-    <TransferModal />
-    <InfoModal />
-    <ErrorModal />
   </div>
+  <TransferModal />
+  <InfoModal />
+  <ErrorModal />
+</div>
 </template>
 
 <script>
 import TransferModal from '@cmp/transfer/modals/index';
 import InfoModal from '@cmp/info/modals/index';
 import ErrorModal from '@cmp/error/modals/index';
-import { BAvatar, BTooltip } from 'bootstrap-vue';
-import { mapGetters, mapState, mapActions } from 'vuex';
+import {
+  BAvatar,
+  BTooltip
+} from 'bootstrap-vue';
+import {
+  mapGetters,
+  mapState,
+  mapActions
+} from 'vuex';
 import {
   GET_CURRENT_WALLET_BALANCES_AMOUNT,
   GET_CURRENT_WALLET_BALANCES_DENOM,
   HYDRATE_CURRENT_WALLET,
   FETCH_WALLET_REWARDS
 } from '@store/wallets';
-import { FETCH_VALIDATORS_LIST } from '@store/validators';
+import {
+  FETCH_VALIDATORS_LIST
+} from '@store/validators';
+import { tokenUtil } from '@static/js/token';
+import * as numeral from 'numeral';
 
 export default {
   components: {
@@ -96,7 +96,10 @@ export default {
     return {
       tooltipShow: false,
       refreshing: false,
-      invalidWallet: false
+      invalidWallet: false,
+      token_price: 0.06,
+      total_usd:0,
+      show_add: false
     };
   },
   computed: {
@@ -111,9 +114,10 @@ export default {
   mounted() {
     this.invalidWallet = this.currentWallet.invalid
 
-   if(this.invalidWallet){
-     this.$bvModal.show("error-modal")
-   }
+    if (this.invalidWallet) {
+      this.$bvModal.show("error-modal")
+    }
+    this.total_usd = tokenUtil.format(numeral(this.currentWalletBalancesAmount.available).value() * Math.pow(10,6) * this.token_price);
   },
   methods: {
     ...mapActions({
@@ -137,4 +141,11 @@ export default {
 * {
   color: var(--textColor);
 }
+.copy {
+  opacity: 0.2
+}
+
+.copy:hover {
+  opacity: 0.5
+}
 </style>
diff --git a/app/src/main.js b/app/src/main.js
index a0ac173..6f00a79 100644
--- a/app/src/main.js
+++ b/app/src/main.js
@@ -20,6 +20,8 @@ import clipboard from 'clipboard';
 import Unicon from 'vue-unicons';
 import { store } from '@store/';
 import { colors } from '@static/js/colors';
+import VueClipboard from 'vue-clipboard2'
+Vue.use(VueClipboard);
 
 import { ToastPlugin } from 'bootstrap-vue';
 Vue.use(ToastPlugin);
diff --git a/app/static/img/icons/copy.png b/app/static/img/icons/copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..9924b823937f92827fe10a4c366ab93bd7168db0
GIT binary patch
literal 8116
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

literal 0
HcmV?d00001


From 556b5fb763a024f661d2d18d69e9d83e29a867b2 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Mon, 21 Dec 2020 13:51:56 +0100
Subject: [PATCH 12/23] Added add/remove categories

---
 app/src/App.vue                               |  5 +-
 .../components/wallets/modals/edit-wallet.vue | 71 ++++++++++++++-----
 2 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/app/src/App.vue b/app/src/App.vue
index 756bfe2..d97811e 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -82,6 +82,7 @@ export default {
       wallets: [],
       delegations: {},
       transactions: [],
+      categories: '',
     };
   },
   created() {
@@ -140,6 +141,7 @@ export default {
         categories =  ['personal','work','multisignature']
         localStorage.setItem('categories', categories);
       }
+      this.categories = categories.join(",");
       this.setCategoryList(categories);
     },
     getAccounts() {
@@ -181,7 +183,7 @@ export default {
                   ms: lse_temp.ms,
                   offline: lse_temp.offline,
                   invalid: lse_temp.invalid,
-                  category: lse_temp.category != undefined ? lse_temp.category : "uncategorized"
+                  category: (lse_temp.category != undefined && this.categories.includes(lse_temp.category)) ? lse_temp.category : "uncategorized"
                 }
 
                 if (wallet_tmp.ms) {
@@ -194,7 +196,6 @@ export default {
               }
             }
           }
-
           this.setWalletsList(wallets);
           this.setWalletsDict(wallets_dict);
           res(1);
diff --git a/app/src/components/wallets/modals/edit-wallet.vue b/app/src/components/wallets/modals/edit-wallet.vue
index d4c9923..c302e9a 100644
--- a/app/src/components/wallets/modals/edit-wallet.vue
+++ b/app/src/components/wallets/modals/edit-wallet.vue
@@ -43,16 +43,27 @@
 
               <b-row style="margin-bottom:10px;margin-top:20px;">
                 <b-col cols="10">
-                  <h6>Category</h6>
+                  <h6>Categories
+                  </h6>
+                </b-col>
+                <b-col>
+                  <!-- <img src="static/img/icons/edit.png" width="12px" class="delete" @click="edit" /> -->
+                  <a @click=" workflow_cat[editing].onPress(), editing = !editing">{{workflow_cat[editing].label}}</a>
                 </b-col>
-                <b-col />
               </b-row>
               <b-row style="margin-bottom:15px;" align-v="center">
                 <b-col cols="10">{{ $t('wallet_category') }}</b-col>
               </b-row>
-              <b-button v-for="(cat, idx) in categories" size="sm" :key="idx" :pressed="filter === cat" variant="outline-primary" style="margin-right:5px;margin-top:5px;" @click="handleCat(cat)">
-                {{ cat }}
-              </b-button>
+              <b-row align-v="center">
+                <b-col v-if="!editing">
+                  <b-button v-for="(cat, idx) in categories_.split(',')" size="sm" :key="idx" :pressed="filter === cat" variant="outline-primary" style="margin-right:5px;margin-top:5px;" @click="handleCat(cat)">
+                    {{ cat }}
+                  </b-button>
+                </b-col>
+                <b-col v-else>
+                  <input v-model="categories_" type="text" />
+                </b-col>
+              </b-row>
             </div>
           </div>
           <div style="margin-bottom:20px">
@@ -60,7 +71,7 @@
               <b-row>
                 <b-col>
                   <div class="d-flex justify-content-center">
-                    <button class="btn btn-primary" @click="updateWallet" :disabled="!disabled">
+                    <button class="btn btn-primary" @click="updateWallet" :disabled="editing || !disabled">
                       <span>{{$t(workflow[step])}}</span>
                     </button>
                   </div>
@@ -81,7 +92,13 @@ import {
   BCol,
   BButton,
 } from 'bootstrap-vue';
-import {  mapState } from 'vuex';
+import {
+  mapState,
+  mapMutations,
+} from 'vuex';
+import {
+  SET_CATEGORY_LIST
+} from '@store/wallets';
 
 export default {
   components: {
@@ -103,7 +120,19 @@ export default {
   data() {
     return {
       workflow: ['Save'],
+      workflow_cat: {
+        false: {
+          label: 'edit',
+          onPress: function(){},
+        },
+        true: {
+          label: 'save',
+          onPress: this.editCategories
+        }
+      },
+      categories_ : "",
       step: 0,
+      editing: false,
       new_wallet_name: this.wallet.account,
       new_wallet_categroy: this.wallet.category,
       filter: this.wallet.category,
@@ -113,17 +142,24 @@ export default {
       wallet_name_to_delete: '',
     };
   },
-  computed:{
+  computed: {
     ...mapState({
-      categories:  state => state.wallets.categories,
+      categories: state => state.wallets.categories,
     }),
   },
+  mounted(){
+    this.categories_ = this.categories.join(',')
+  },
   methods: {
+    ...mapMutations({
+      setCategoryList: SET_CATEGORY_LIST,
+    }),
     onResetModal() {
       this.step = 0;
       this.new_wallet_name = this.wallet.account;
       this.new_wallet_categroy = this.wallet.category;
       this.disabled = true;
+      this.editing=false;
       this.name_exists = false;
       this.name_correct = true;
     },
@@ -143,9 +179,9 @@ export default {
     validateWalltNameExist() {
       let wallet_list = this.new_wallet_name;
 
-      if (wallet_list == this.wallet.account){
+      if (wallet_list == this.wallet.account) {
         this.name_exists = false;
-      }else{
+      } else {
         if (localStorage.getItem('wallet_list')) {
           let wallet_list_old = localStorage.getItem('wallet_list').split(',');
           if (wallet_list_old.includes(wallet_list)) {
@@ -162,23 +198,26 @@ export default {
       this.filter = cat;
       this.new_wallet_categroy = cat;
     },
+    editCategories() {
+      localStorage.setItem('categories', this.categories_.split(','))
+      this.setCategoryList(this.categories_.split(','))
+    },
     updateWallet() {
       var updated_wallet = JSON.parse(localStorage.getItem(this.wallet.account))
 
-      if (this.new_wallet_categroy != this.wallet.category){
-        updated_wallet["category"]= this.new_wallet_categroy
+      if (this.new_wallet_categroy != this.wallet.category) {
+        updated_wallet["category"] = this.new_wallet_categroy
       }
 
       localStorage.setItem(this.new_wallet_name, JSON.stringify(updated_wallet))
 
-      if (this.new_wallet_name != this.wallet.account){
+      if (this.new_wallet_name != this.wallet.account) {
         localStorage.removeItem(this.wallet.account)
-        localStorage.setItem("wallet_list", localStorage.getItem("wallet_list").replace(","+this.wallet.account+",",","+this.new_wallet_name+","))
+        localStorage.setItem("wallet_list", localStorage.getItem("wallet_list").replace("," + this.wallet.account + ",", "," + this.new_wallet_name + ","))
       }
       this.$emit('onUpdateSuccess');
     },
     deleteWallet() {
-      console.log(this.wallet)
       if (confirm("Do you really want to delete " + this.wallet.account + " ?")) {
         localStorage.removeItem(this.wallet.account)
         var wallet_list_tmp = (localStorage.getItem("wallet_list")) ? localStorage.getItem("wallet_list").split(',') : '';

From fa4aae05065748ddf218ccbf5d712fb3b1a4730f Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Tue, 22 Dec 2020 12:14:13 +0100
Subject: [PATCH 13/23] Added fetch price from API

---
 app/src/App.vue                               |  7 +-
 .../topbar/no-wallet-actions.vue              | 29 ++----
 .../private-layout/topbar/wallet-actions.vue  | 17 ++--
 app/src/services/price-api/index.js           |  7 ++
 .../services/price-api/price-api.service.js   | 99 +++++++++++++++++++
 app/src/services/price-api/price.service.js   |  7 ++
 app/src/store/account/actions.js              | 13 ++-
 app/src/store/account/mutations.js            |  4 +
 app/static/js/token.js                        |  1 +
 9 files changed, 153 insertions(+), 31 deletions(-)
 create mode 100644 app/src/services/price-api/index.js
 create mode 100644 app/src/services/price-api/price-api.service.js
 create mode 100644 app/src/services/price-api/price.service.js

diff --git a/app/src/App.vue b/app/src/App.vue
index d97811e..fe3b6a2 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -28,7 +28,8 @@ import {
   SET_CATEGORY_LIST
 } from '@store/wallets';
 import {
-  SET_ACCOUNT
+  SET_ACCOUNT,
+  GET_PRICE
 } from '@store/account';
 import {
   FETCH_VALIDATORS_LIST
@@ -90,13 +91,13 @@ export default {
       await this.getChain();
       await this.getAccounts();
       await this.fetchValidatorsList();
+      await this.getPrice();
       this.isLoading = false;
     };
     bootstrap();
   },
   mounted() {
     this.getCategories();
-
   },
   methods: {
     ...mapMutations({
@@ -104,10 +105,10 @@ export default {
       setWalletsDict: SET_WALLETS_DICT,
       setAccount: SET_ACCOUNT,
       setCategoryList: SET_CATEGORY_LIST,
-
     }),
     ...mapActions({
       fetchValidatorsList: FETCH_VALIDATORS_LIST,
+      getPrice: GET_PRICE,
     }),
     getChain() {
       return new Promise(async res => {
diff --git a/app/src/components/private-layout/topbar/no-wallet-actions.vue b/app/src/components/private-layout/topbar/no-wallet-actions.vue
index e0ca9f5..88286d3 100644
--- a/app/src/components/private-layout/topbar/no-wallet-actions.vue
+++ b/app/src/components/private-layout/topbar/no-wallet-actions.vue
@@ -2,9 +2,10 @@
   <div class="d-flex w-100 h-100 justify-content-between align-items-center">
     <div class="d-flex justify-content-center flex-column ml-3" v-if="!loadingWallet">
       <h5>Total Balance</h5>
-      <h5 :style="{ fontWeight: 'bolder' }">
-        {{ globalData.kichain.token }} {{total}}
-      </h5>
+      <h4>
+        <span  :style="{ fontWeight: '800' }">{{total}} </span>
+        <span :style="{ fontWeight: '400' }">{{ globalData.kichain.token }}</span>
+      </h4>
       <p
         :style="{
           color: 'var(--secondary)',
@@ -13,24 +14,13 @@
         }"
       >
 
-      $ {{total_usd}} . $ {{ token_price }}/{{ globalData.kichain.token }}
+      ≈ ${{total_usd}}  (${{ token_price }}/{{ globalData.kichain.token }})
       </p>
 
-
     </div>
     <span v-else>
       <b-spinner type="grow" variant="light" />
     </span>
-    <!-- <div>
-      <h5>
-        <span> Total Balance </span>
-        <span v-if="!loadingWallet">
-          <h4> <span> {{ globalData.kichain.token }} {{total}}</span></h4>
-          <h6> USD  ~ {{total_usd}}</h6>
-        </span>
-
-      </h5>
-    </div> -->
     <div class="d-flex flex-row">
       <div class="pr-4">
         <a
@@ -94,6 +84,7 @@ export default {
     ...mapState({
       loadingWallet: state => state.wallets.loading,
       wallets: state => state.wallets.list,
+      token_price: state => state.price,
     }),
   },
   data() {
@@ -105,7 +96,7 @@ export default {
       token: '',
       total:0,
       total_usd:0,
-      token_price:0.06
+      // token_price:0.06
     };
   },
   mounted() {
@@ -197,6 +188,7 @@ export default {
       let total = 0
 
       for (var w in this.wallets){
+
         const responseBalances = await services.wallet.fetchBalancesList(
           this.wallets[w].address,
         );
@@ -225,9 +217,8 @@ export default {
           }
         }
       }
-
-      this.total_usd = tokenUtil.format(total * this.token_price);
-      this.total = tokenUtil.format(total)
+      this.total_usd = tokenUtil.formatShort(total * this.token_price);
+      this.total = tokenUtil.formatShort(total)
     }
   },
 };
diff --git a/app/src/components/private-layout/topbar/wallet-actions.vue b/app/src/components/private-layout/topbar/wallet-actions.vue
index f91085b..83dd639 100644
--- a/app/src/components/private-layout/topbar/wallet-actions.vue
+++ b/app/src/components/private-layout/topbar/wallet-actions.vue
@@ -23,18 +23,17 @@
       <img type="button" v-clipboard:copy="currentWallet.address" src="static/img/icons/copy.png" width="15px" class="copy" />
 
       </div>
-
-      <h5 :style="{ fontWeight: 'bolder' }">
-        {{ globalData.kichain.token }}
-        {{ currentWalletBalancesAmount.available }}
-      </h5>
+      <h4>
+        <span  :style="{ fontWeight: '800' }">{{ total_available }} </span>
+        <span :style="{ fontWeight: '400' }">{{ globalData.kichain.token }}</span>
+      </h4>
       <p :style="{
             color: 'var(--secondary)',
             fontSize: '0.9rem',
             fontWeight: '600',
           }">
 
-        $ {{total_usd}} . $ {{ token_price }}/{{ globalData.kichain.token }}
+        ≈ ${{total_usd}}  (${{ token_price }}/{{ globalData.kichain.token }})
       </p>
     </div>
   </div>
@@ -97,8 +96,8 @@ export default {
       tooltipShow: false,
       refreshing: false,
       invalidWallet: false,
-      token_price: 0.06,
       total_usd:0,
+      total_available:0,
       show_add: false
     };
   },
@@ -109,6 +108,7 @@ export default {
     }),
     ...mapState({
       currentWallet: state => state.wallets.current,
+      token_price: state => state.price,
     }),
   },
   mounted() {
@@ -117,7 +117,8 @@ export default {
     if (this.invalidWallet) {
       this.$bvModal.show("error-modal")
     }
-    this.total_usd = tokenUtil.format(numeral(this.currentWalletBalancesAmount.available).value() * Math.pow(10,6) * this.token_price);
+    this.total_available = tokenUtil.formatShort(numeral(this.currentWalletBalancesAmount.available).value() * Math.pow(10,6));
+    this.total_usd = tokenUtil.formatShort(numeral(this.currentWalletBalancesAmount.available).value() * Math.pow(10,6) * this.token_price);
   },
   methods: {
     ...mapActions({
diff --git a/app/src/services/price-api/index.js b/app/src/services/price-api/index.js
new file mode 100644
index 0000000..2d21c6f
--- /dev/null
+++ b/app/src/services/price-api/index.js
@@ -0,0 +1,7 @@
+import { PriceApiService } from './price-api.service';
+import { PriceService } from './price.service';
+
+export const priceservices = {
+  priceApi: new PriceApiService(),
+  price: new PriceService(),
+};
diff --git a/app/src/services/price-api/price-api.service.js b/app/src/services/price-api/price-api.service.js
new file mode 100644
index 0000000..cdefcd8
--- /dev/null
+++ b/app/src/services/price-api/price-api.service.js
@@ -0,0 +1,99 @@
+import Axios from 'axios';
+import * as queryString from 'query-string';
+import config from '@static/js/config';
+const CancelToken = Axios.CancelToken;
+
+export class PriceApiService {
+  static token = '';
+  static setToken(token) {
+    PriceApiService.token = token;
+  }
+
+  constructor() {
+    this.options = {
+      baseURL: config.kichain.priceUrl,
+    };
+  }
+
+  async get(url, query) {
+    url = (query && `${url}?${queryString.stringify(query)}`) || url;
+
+    return this.call({
+      url,
+    });
+  }
+
+  async post(url, data) {
+    return this.call({
+      data,
+      method: 'POST',
+      url,
+      headers: {
+        'Content-Type': 'text/plain',
+      },
+    });
+  }
+
+  async postWithProgress(url, data, onUploadProgress, onCancelPost) {
+    return this.call({
+      data,
+      method: 'POST',
+      onUploadProgress,
+      url,
+      ...(onCancelPost && { cancelToken: new CancelToken(onCancelPost) }),
+    });
+  }
+
+  async put(url, data, onUploadProgress, onCancelPost) {
+    return this.call({
+      data,
+      method: 'PUT',
+      url,
+      ...(onUploadProgress && onUploadProgress),
+      ...(onCancelPost && { cancelToken: new CancelToken(onCancelPost) }),
+    });
+  }
+
+  async delete(url) {
+    return this.call({
+      method: 'DELETE',
+      url,
+    });
+  }
+
+  async call(config) {
+    config.url = this.options.baseURL + config.url;
+    if (PriceApiService.token) {
+      config.headers = config.headers || {};
+      config.headers.Authorization = 'Bearer ' + PriceApiService.token;
+    }
+    return Axios.request(config);
+  }
+
+  async unserialize(req, messageType) {
+    const res = await req;
+
+    return this.castObjectToProtoMessage(res.data, messageType);
+  }
+
+  handleError(error) {
+    const response = error.response && error.response.data;
+    const errors = response && response.errors;
+    return (
+      (errors && errors.length > 0 && errors[0].message.toUpperCase()) || ''
+    );
+  }
+
+  castObjectToProtoMessage(obj, messageType) {
+    const err = messageType.verify(obj);
+
+    if (err && !err.includes('enum value expected')) {
+      // we exclude "enum error" because verify is currently (stupidly) stricter than fromObject
+      throw new Error(
+        `JSON was not compatible with message ${messageType.name} (${err}).`,
+      );
+    }
+
+    return messageType.fromObject(obj);
+  }
+}
diff --git a/app/src/services/price-api/price.service.js b/app/src/services/price-api/price.service.js
new file mode 100644
index 0000000..5755ad5
--- /dev/null
+++ b/app/src/services/price-api/price.service.js
@@ -0,0 +1,7 @@
+import { PriceApiService } from './price-api.service';
+
+export class PriceService extends PriceApiService {
+  async fetchPrice() {
+    return this.get(`/`);
+  }
+}
diff --git a/app/src/store/account/actions.js b/app/src/store/account/actions.js
index fde06ec..233dafa 100644
--- a/app/src/store/account/actions.js
+++ b/app/src/store/account/actions.js
@@ -1,7 +1,9 @@
 import { services } from '@services/index';
-import { SET_ACCOUNT } from './mutations';
+import { priceservices } from '@services/price-api/index';
+import { SET_ACCOUNT, SET_PRICE} from './mutations';
 
 export const HYDRATE_ACCOUNT = 'HYDRATE_ACCOUNT';
+export const GET_PRICE = 'GET_PRICE';
 
 export const actions = {
   [HYDRATE_ACCOUNT]: async (
@@ -14,4 +16,13 @@ export const actions = {
       commit(SET_ACCOUNT, response.data.result);
     }
   },
+  [GET_PRICE]: async (
+    { commit, state, getters, dispatch },
+  ) => {
+    // Start to fetch data
+    const response = await priceservices.price.fetchPrice();
+    if (response.data.result) {
+      commit(SET_PRICE, response.data.result);
+    }
+  },
 };
diff --git a/app/src/store/account/mutations.js b/app/src/store/account/mutations.js
index 081f9dc..05a295e 100644
--- a/app/src/store/account/mutations.js
+++ b/app/src/store/account/mutations.js
@@ -1,5 +1,6 @@
 // Mutation Types definition
 export const SET_ACCOUNT = `SET_ACCOUNT`;
+export const SET_PRICE = `SET_PRICE`;
 
 // Mutations
 export const mutations = {
@@ -7,4 +8,7 @@ export const mutations = {
   [SET_ACCOUNT](state, payload) {
     state.account = { ...state.account, ...payload };
   },
+  [SET_PRICE](state, payload) {
+    state.price =  payload ;
+  },
 };
diff --git a/app/static/js/token.js b/app/static/js/token.js
index d476e15..be8c34c 100644
--- a/app/static/js/token.js
+++ b/app/static/js/token.js
@@ -2,4 +2,5 @@ import * as numeral from 'numeral';
 
 export const tokenUtil = {
   format: tokens => numeral(tokens / Math.pow(10, 6)).format('0,0.00[0000]'),
+  formatShort: tokens => numeral(tokens / Math.pow(10, 6)).format('0,0.00'),
 };

From 420c8b8f2bd9e1640460dfc006b94a36aa7c6746 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Wed, 23 Dec 2020 10:07:45 +0100
Subject: [PATCH 14/23] Fixed locked tokens computation

---
 app/src/store/wallets/actions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/store/wallets/actions.js b/app/src/store/wallets/actions.js
index f36570d..4611b71 100644
--- a/app/src/store/wallets/actions.js
+++ b/app/src/store/wallets/actions.js
@@ -237,7 +237,7 @@ export const actions = {
         let total_duration = end - start
         let elapsed_duration = (Math.floor(Date.now() / 1000) - start > 0) ? Math.floor(Date.now() / 1000) - start : 0
         let vested_ratio = elapsed_duration / total_duration
-        let locked_ = original * (1 - vested_ratio)
+        let locked_ = original * Math.max(1 - vested_ratio, 0)
         let vested = original - locked_
 
         if (vesting_delayed){

From 08f7dfc19b90ae068ef5817ae9b03590950a4d3b Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Wed, 23 Dec 2020 10:08:49 +0100
Subject: [PATCH 15/23] Minor styling

---
 app/src/components/private-layout/index.vue |  15 +++++++++++++--
 app/src/views/wallet/transactions/index.vue |   8 ++++----
 app/src/views/wallet/withdraw/index.vue     |   4 ++--
 app/static/img/chain/thinking-face.png      | Bin 0 -> 58074 bytes
 app/static/img/icons/ki_foundation.png      | Bin 0 -> 13382 bytes
 5 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 app/static/img/chain/thinking-face.png
 create mode 100644 app/static/img/icons/ki_foundation.png

diff --git a/app/src/components/private-layout/index.vue b/app/src/components/private-layout/index.vue
index f86cf5b..d96a002 100644
--- a/app/src/components/private-layout/index.vue
+++ b/app/src/components/private-layout/index.vue
@@ -8,7 +8,7 @@
         <TopBar />
       </b-col>
     </b-row>
-    <b-row :style="{ marginTop: '5px', height: 'calc(100% - 80px)' }">
+    <b-row :style="{ marginTop: '5px', height: 'calc(100% - 100px)' }">
       <b-col class="pr-0" cols="1" :style="{ marginRight: '10px' }">
         <SideMenu />
       </b-col>
@@ -18,6 +18,10 @@
         </Content>
       </b-col>
     </b-row>
+    <b-row class="footer justify-content-md-center align-items-center" :style="{ marginTop: '15px' }">
+      made by <img src="static/img/icons/ki_foundation.png" style="margin-left: 5px; height: 7px; width: auto;"/>
+    </b-row>
+
   </div>
 </template>
 
@@ -40,4 +44,11 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.footer{
+  font-family: Roboto, -apple-system, BlinkMacSystemFont, Segoe UI,
+    Helvetica Neue, Arial, sans-serif;
+  color: #2d1d67;
+  font-size: 10px;
+}
+</style>
diff --git a/app/src/views/wallet/transactions/index.vue b/app/src/views/wallet/transactions/index.vue
index 278c6bd..bd545cd 100644
--- a/app/src/views/wallet/transactions/index.vue
+++ b/app/src/views/wallet/transactions/index.vue
@@ -3,7 +3,7 @@
   <div class="d-flex w-100 h-100 flex-column px-3">
 
 
-      <b-row class="header align-items-center mx-0" style="min-height:40px">
+      <b-row   v-if="transactions && transactions.length" class="header align-items-center mx-0" style="min-height:40px">
           <b-col>
             <b-row class="w-100 align-items-center">
               <b-col cols="2"><span class="ml-4">Tx</span></b-col>
@@ -50,9 +50,9 @@
           class="d-flex align-items-center w-100 h-100 text-center justify-content-center"
           >
           <div>
-          <p style="font-size:60px">
-            🤔
-          </p>
+            <p style="margin-bottom: 10px">
+              <img src="static/img/chain/thinking-face.png" width="150px"/>
+            </p>
           {{ $t('webwallet_no_transactions') }}
         </div>
       </div>
diff --git a/app/src/views/wallet/withdraw/index.vue b/app/src/views/wallet/withdraw/index.vue
index 79ab7a9..418f332 100644
--- a/app/src/views/wallet/withdraw/index.vue
+++ b/app/src/views/wallet/withdraw/index.vue
@@ -92,8 +92,8 @@
       class="d-flex align-items-center w-100 h-100 text-center justify-content-center"
     >
       <div>
-        <p style="font-size:60px">
-          🤔
+        <p style="margin-bottom: 10px">
+          <img src="static/img/chain/thinking-face.png" width="150px"/>
         </p>
         {{ $t('webwallet_no_delegations') }}
       </div>
diff --git a/app/static/img/chain/thinking-face.png b/app/static/img/chain/thinking-face.png
new file mode 100644
index 0000000000000000000000000000000000000000..0347f70e60f1e641ccea4647bfa9ce7504e1b1fd
GIT binary patch
literal 58074
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
DzympC

literal 0
HcmV?d00001

diff --git a/app/static/img/icons/ki_foundation.png b/app/static/img/icons/ki_foundation.png
new file mode 100644
index 0000000000000000000000000000000000000000..27a863c6adbdbe3125571f593a60ecaa27581fe7
GIT binary patch
literal 13382
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
B!_@!)

literal 0
HcmV?d00001


From 63967ee4ba9d7d73e0aa55504511727d9057c2ee Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Wed, 23 Dec 2020 11:05:51 +0100
Subject: [PATCH 16/23] Fixed auto data import for ms addresses

---
 .../wallets/modals/import-wallet.vue          | 30 ++++++++++++++-----
 app/src/views/wallet/delegation/index.vue     |  4 +--
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/app/src/components/wallets/modals/import-wallet.vue b/app/src/components/wallets/modals/import-wallet.vue
index 5781be5..ded7b99 100644
--- a/app/src/components/wallets/modals/import-wallet.vue
+++ b/app/src/components/wallets/modals/import-wallet.vue
@@ -239,6 +239,7 @@ export default {
       ms_address_threshold: '',
       ms_address_pubkeys: '',
       ms_address_pubkeys_sort: true,
+      ms_pubkeys_base64_final: [],
       ms_data_correct: true,
       ms_data_pk_correct: false,
       ms_data_th_correct: false,
@@ -283,8 +284,9 @@ export default {
       this.ms_data_th_correct = false;
       this.ms_address_pubkeys = '';
       this.ms_address_threshold = '';
+      this.ms_pubkeys_base64_final = '';
+
       this.resetMnemonic()
-      // this.$emit('onResetModal');
     },
     importWallet() {
       const formValue = {
@@ -313,7 +315,6 @@ export default {
 
       if (!this.require_ms_data || ms_data_filled) {
 
-        var pubkeys_base64_final = []
         if (ms_data_filled) {
             var pubkeys_base64_tmp = []
 
@@ -329,19 +330,18 @@ export default {
               pubkeys_base64_tmp.sort((a, b) => a[1].localeCompare(b[1]));
             }
 
-            pubkeys_base64_final = pubkeys_base64_tmp.map(function(x) {
+            this.ms_pubkeys_base64_final = pubkeys_base64_tmp.map(function(x) {
               return x[0];
             });
           }
 
-
         const formValue = {
           wallet_name: this.wallet_name,
           ms_address: this.ms_address,
           wallet_pass_tmp: this.wallet_pass_tmp,
           multisig: true,
           threshold: this.ms_address_threshold,
-          pubkeys: pubkeys_base64_final,
+          pubkeys: this.ms_pubkeys_base64_final,
         };
         this.$emit('onImportMultiSigWallet', formValue);
       } else {
@@ -451,19 +451,33 @@ export default {
       }
       this.disabled = this.ms_data_pk_correct && this.ms_data_th_correct;
     },
-    // Query the blockchain to check whether the address is already known
+    // Query the blockchain to check whether we should ask for ms data
     async checkAddressStatus() {
       const account = await services.auth.fetchAccount(this.ms_address)
-      if (account.data.result.value.public_key == null){
+      var account_pubkey = {}
+      if (account.data.result.type == "cosmos-sdk/ContinuousVestingAccount" ||
+       account.data.result.type == 'cosmos-sdk/DelayedVestingAccount') {
+          account_pubkey = account.data.result.value.BaseVestingAccount.BaseAccount.public_key
+      }
+      else{
+          account_pubkey = account.data.result.value.public_key
+      }
+
+      if (account_pubkey == null){
         return true
       }
       else{
-        if (account.data.result.value.public_key.type !="tendermint/PubKeyMultisigThreshold") {
+        if (account_pubkey.type !="tendermint/PubKeyMultisigThreshold") {
           this.not_ms_address = true;
           return true
         }
       }
 
+      this.ms_address_threshold = account_pubkey.value.threshold
+      this.ms_pubkeys_base64_final = account_pubkey.value.pubkeys.map(function(x) {
+        return x.value;
+      });
+
       return false
     },
     validateMnemonic(type) {
diff --git a/app/src/views/wallet/delegation/index.vue b/app/src/views/wallet/delegation/index.vue
index af42f8b..b20b942 100644
--- a/app/src/views/wallet/delegation/index.vue
+++ b/app/src/views/wallet/delegation/index.vue
@@ -110,8 +110,8 @@
       class="d-flex align-items-center w-100 h-100 text-center justify-content-center"
     >
       <div>
-        <p style="font-size:60px">
-          🤔
+        <p style="margin-bottom: 10px">
+          <img src="static/img/chain/thinking-face.png" width="150px"/>
         </p>
         {{ $t('webwallet_no_delegations') }}
       </div>

From b9bf2ce3c7627a0c886650d7e1a458a2a15e3ac8 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Wed, 23 Dec 2020 12:04:45 +0100
Subject: [PATCH 17/23] Improved info page

---
 app/src/components/info/modals/index.vue | 117 +++++++++++++++++------
 app/src/store/wallets/actions.js         |   2 +-
 2 files changed, 89 insertions(+), 30 deletions(-)

diff --git a/app/src/components/info/modals/index.vue b/app/src/components/info/modals/index.vue
index d793de9..b19d9cd 100644
--- a/app/src/components/info/modals/index.vue
+++ b/app/src/components/info/modals/index.vue
@@ -4,7 +4,7 @@
     <!-- ========================Transfer form============================ -->
     <b-col cols="7">
 
-      <b-row class="text-center" style="margin-bottom:20px; margin-top:10px">
+      <b-row class="text-center" style="margin-bottom:20px; margin-top:40px">
         <b-col>
 
           <b-avatar size="7rem" variant="light" :style="{
@@ -52,25 +52,21 @@
                   /* color: 'var(--secondary)', */
                   fontSize: '0.85rem',
                   fontWeight: '600',
-                }"
-                 v-if="!multisig">
-                 Public Key
+                }" v-if="!multisig">
+                  Public Key
                 </p>
                 <p :style="{
                   /* color: 'var(--secondary)', */
                   fontSize: '0.85rem',
                   fontWeight: '600',
-                }"
-                 v-if="multisig">
-                 Description
+                }" v-if="multisig">
+                  Description
                 </p>
-                <div style="display:flex; flex-direction: row; justify-content: center; align-items: center;" >
-                  <span style="border: none ;color: var(--darkbg); display:block; width: 180px;  word-wrap:break-word;"
-                    v-if="!multisig">
+                <div style="display:flex; flex-direction: row; justify-content: center; align-items: center;">
+                  <span style="border: none ;color: var(--darkbg); display:block; width: 180px;  word-wrap:break-word;" v-if="!multisig">
                     {{ publickeyBech32 }}
                   </span>
-                  <span style="border: none ;color: var(--darkbg); display:block; width: 180px;  word-wrap:break-word;"
-                    v-else>
+                  <span style="border: none ;color: var(--darkbg); display:block; width: 180px;  word-wrap:break-word;" v-else>
                     {{ currentWallet.multisign_data.description }}
                   </span>
                 </div>
@@ -81,14 +77,10 @@
       </b-row>
     </b-col>
 
-    <b-col cols="5" style="margin-top:20px">
+    <b-col cols="5" style="margin-top:0px">
       <b-row class="text-center">
         <b-col cols="12" class="pl-1 pr-1">
           <div class="d-flex justify-content-center flex-column" style="height:80px; border-bottom: 1px solid var(--pale-grey);">
-            <h6 :style="{ fontWeight: 'bolder' }">
-              {{ globalData.kichain.token }}
-              {{ currentWalletBalancesAmount.available }}
-            </h6>
             <p :style="{
               color: 'var(--secondary)',
               fontSize: '0.85rem',
@@ -96,14 +88,21 @@
             }">
               Available
             </p>
+            <h6 :style="{ fontWeight: 'bolder' }">
+              {{ currentWalletBalancesAmount.available }}
+              {{ globalData.kichain.token }}
+            </h6>
+            <p :style="{
+                color: 'var(--secondary)',
+                fontSize: '0.85rem',
+                fontWeight: '600',
+              }">
+              ≈ ${{ this.balancesUSD.available }}
+            </p>
           </div>
         </b-col>
         <b-col cols="12" class="pl-1 pr-1">
           <div class="d-flex justify-content-center flex-column" style="height:80px; border-bottom: 1px solid var(--pale-grey);">
-            <h6 :style="{ fontWeight: 'bolder' }">
-              {{ globalData.kichain.token }}
-              {{ currentWalletBalancesAmount.delegated }}
-            </h6>
             <p :style="{
               color: 'var(--secondary)',
               fontSize: '0.85rem',
@@ -111,14 +110,21 @@
             }">
               Delegated
             </p>
+            <h6 :style="{ fontWeight: 'bolder' }">
+              {{ currentWalletBalancesAmount.delegated }}
+              {{ globalData.kichain.token }}
+            </h6>
+            <p :style="{
+                color: 'var(--secondary)',
+                fontSize: '0.85rem',
+                fontWeight: '600',
+              }">
+              ≈ ${{ this.balancesUSD.delegated }}
+            </p>
           </div>
         </b-col>
         <b-col cols="12" class="pl-1 pr-1">
           <div class="d-flex justify-content-center flex-column" style="height:80px;border-bottom: 1px solid var(--pale-grey);">
-            <h6 :style="{ fontWeight: 'bolder' }">
-              {{ globalData.kichain.token }}
-              {{ currentWalletBalancesAmount.unbonding }}
-            </h6>
             <p :style="{
               color: 'var(--secondary)',
               fontSize: '0.85rem',
@@ -126,20 +132,60 @@
             }">
               Unbonding
             </p>
+            <h6 :style="{ fontWeight: 'bolder' }">
+              {{ currentWalletBalancesAmount.unbonding }}
+              {{ globalData.kichain.token }}
+            </h6>
+            <p :style="{
+                color: 'var(--secondary)',
+                fontSize: '0.85rem',
+                fontWeight: '600',
+              }">
+              ≈ ${{ this.balancesUSD.unbonding }}
+            </p>
           </div>
         </b-col>
         <b-col cols="12" class="pl-1 pr-1">
           <div class="d-flex justify-content-center flex-column" style="height:80px; border-bottom: 1px solid var(--pale-grey);">
+            <p :style="{
+              color: 'var(--secondary)',
+              fontSize: '0.85rem',
+              fontWeight: '600',
+            }">
+              Locked
+            </p>
             <h6 :style="{ fontWeight: 'bolder' }">
-              {{ globalData.kichain.token }}
               {{ currentWalletBalancesAmount.locked }}
+              {{ globalData.kichain.token }}
             </h6>
+            <p :style="{
+                color: 'var(--secondary)',
+                fontSize: '0.85rem',
+                fontWeight: '600',
+              }">
+              ≈ ${{ this.balancesUSD.locked }}
+            </p>
+          </div>
+        </b-col>
+        <b-col cols="12" class="pl-1 pr-1">
+          <div class="d-flex justify-content-center flex-column" style="height:80px">
             <p :style="{
               color: 'var(--secondary)',
               fontSize: '0.85rem',
               fontWeight: '600',
             }">
-              Locked
+              Total
+            </p>
+            <h6 :style="{ fontWeight: 'bolder' }">
+              {{ currentWalletBalancesAmount.total }}
+              {{ globalData.kichain.token }}
+            </h6>
+            <p :style="{
+                color: 'var(--secondary)',
+                fontSize: '0.85rem',
+                fontWeight: '600',
+              }">
+              ≈ ${{ this.balancesUSD.total }}
             </p>
           </div>
         </b-col>
@@ -177,6 +223,10 @@ import {
   GET_CURRENT_WALLET_BALANCES_DENOM,
   HYDRATE_CURRENT_WALLET,
 } from '@store/wallets';
+import {
+  tokenUtil
+} from '@static/js/token';
+import * as numeral from 'numeral';
 
 export default {
   components: {
@@ -203,7 +253,17 @@ export default {
     }),
     ...mapState({
       currentWallet: state => state.wallets.current,
+      token_price: state => state.price,
     }),
+    balancesUSD() {
+      return {
+        available: tokenUtil.formatShort(numeral(this.currentWalletBalancesAmount.available).value() * Math.pow(10, 6) * this.token_price),
+        delegated: tokenUtil.formatShort(numeral(this.currentWalletBalancesAmount.delegated).value() * Math.pow(10, 6) * this.token_price),
+        unbonding: tokenUtil.formatShort(numeral(this.currentWalletBalancesAmount.unbonding).value() * Math.pow(10, 6) * this.token_price),
+        locked: tokenUtil.formatShort(numeral(this.currentWalletBalancesAmount.locked).value() * Math.pow(10, 6) * this.token_price),
+        total: tokenUtil.formatShort(numeral(this.currentWalletBalancesAmount.total).value() * Math.pow(10, 6) * this.token_price),
+      }
+    },
     multisig() {
       return this.$store.state.wallets.current.multisign;
     },
@@ -223,8 +283,7 @@ export default {
     },
 
   },
-  methods: {
-  },
+  methods: {},
 };
 </script>
 
diff --git a/app/src/store/wallets/actions.js b/app/src/store/wallets/actions.js
index 4611b71..ccfd71e 100644
--- a/app/src/store/wallets/actions.js
+++ b/app/src/store/wallets/actions.js
@@ -297,7 +297,7 @@ export const actions = {
         }
       }
 
-      let balances = {"available":tokenUtil.format(available), "delegated":tokenUtil.format(delegated), "unbonding":tokenUtil.format(unbonding), "available_real":tokenUtil.format(available_real), "locked":tokenUtil.format(locked), "denom":state.app.denom }
+      let balances = {"available":tokenUtil.format(available), "delegated":tokenUtil.format(delegated), "unbonding":tokenUtil.format(unbonding), "available_real":tokenUtil.format(available_real), "locked":tokenUtil.format(locked), "total":tokenUtil.format(available + delegated + locked), "denom":state.app.denom }
 
       if (responseBalances.data.result) {
         walletTmp = {

From 472c81a1da94718cef78b2da57ee8dd2d4295df2 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Wed, 23 Dec 2020 15:38:52 +0100
Subject: [PATCH 18/23] Added download button for tx generation

---
 app/src/components/transfer/modals/index.vue  | 30 +++++++++----
 .../delegation/modals/delegate.modal.vue      | 40 +++++++++++-------
 .../delegation/modals/redelegate.modal.vue    | 42 ++++++++++++-------
 .../delegation/modals/undelegate.modal.vue    | 41 +++++++++++-------
 app/src/views/wallet/sign/index.vue           | 17 +-------
 .../wallet/withdraw/modals/withdraw.modal.vue | 36 +++++++++-------
 app/static/css/index.css                      |  1 +
 app/static/js/util.js                         | 16 +++++++
 8 files changed, 137 insertions(+), 86 deletions(-)

diff --git a/app/src/components/transfer/modals/index.vue b/app/src/components/transfer/modals/index.vue
index 76807e5..c676fdb 100644
--- a/app/src/components/transfer/modals/index.vue
+++ b/app/src/components/transfer/modals/index.vue
@@ -103,13 +103,22 @@
           </li>
           <b-row align-v="center">
             <b-col class="d-flex justify-content-center">
-              <a class="btn btn-primary" @click="sendTransfer">
-                <span
-                  v-if="!multisig"
-                  >{{ $t('transfer') }}</span
-                >
-                <span v-else>Generate</span>
-              </a>
+              <span v-if="!multisig" >
+                <a class="btn btn-primary" @click="sendTransfer">
+                  {{ $t('transfer') }}
+                </a>
+              </span>
+              <span v-else >
+                <a v-if="transfer.output==''" class="btn btn-primary" @click="sendTransfer">
+                  Generate
+                </a>
+                <a v-else class="btn btn-download"
+                @click="download()">
+                  Download
+                </a>
+              </span>
+
+
             </b-col>
           </b-row>
         </form>
@@ -131,6 +140,7 @@ import { BRow, BCol, BContainer, BModal } from 'bootstrap-vue';
 import { mapState, mapActions } from 'vuex';
 import { POST_TX } from '@store/tx';
 import FeesInput from '@cmp/tx/fees.input';
+import util from '@static/js/util';
 
 export default {
   components: {
@@ -182,7 +192,6 @@ export default {
     currentWallet() {
       return this.$store.state.wallets.current;
     },
-
     multisig() {
       return this.$store.state.wallets.current.multisign;
     },
@@ -361,7 +370,10 @@ export default {
         if (flag == 1){ //half
           this.transfer.amount = available_tokens > 1 ? Number(Math.round(available_tokens / 2 + 'e6') + 'e-6') : 0
         }
-    }
+    },
+    download() {
+      return util.download( 'transfer_' + this.transfer.amount + 'ki_tx.json', document, this.transfer.output);
+    },
   },
 };
 </script>
diff --git a/app/src/views/wallet/delegation/modals/delegate.modal.vue b/app/src/views/wallet/delegation/modals/delegate.modal.vue
index 65f6a40..f3c54fa 100644
--- a/app/src/views/wallet/delegation/modals/delegate.modal.vue
+++ b/app/src/views/wallet/delegation/modals/delegate.modal.vue
@@ -86,21 +86,27 @@
         </li>
         <b-row align-v="center" align-h="center">
           <b-col class="text-center">
-            <button
-              class="btn btn-primary"
-              :disabled="tx.loading === true"
-              @click="sendDelegateTx"
-            >
-              <div v-if="!tx.loading">
-                <span v-if="!multisig">
-                  {{ $t('delegatetx') }}
-                </span>
-                <span v-else>Generate</span>
-              </div>
-              <div v-else>
-                <b-spinner small label="Small Spinner" />
-              </div>
-            </button>
+            <div v-if="!tx.loading">
+
+            <span v-if="!multisig" >
+              <a class="btn btn-primary" @click="sendDelegateTx">
+                {{ $t('delegatetx') }}
+              </a>
+            </span>
+            <span v-else >
+              <a v-if="delegate.output==''" class="btn btn-primary" @click="sendDelegateTx">
+                Generate
+              </a>
+              <a v-else class="btn btn-download"
+              @click="download()">
+                Download
+              </a>
+            </span>
+          </div>
+
+            <div v-else>
+              <b-spinner small label="Small Spinner" />
+            </div>
           </b-col>
 
         </b-row>
@@ -116,6 +122,7 @@ import { mapActions } from 'vuex';
 import { POST_TX } from '@store/tx';
 import { tokenUtil } from '@static/js/token';
 import FeesInput from '@cmp/tx/fees.input';
+import util from '@static/js/util';
 
 export default {
   components: {
@@ -311,6 +318,9 @@ export default {
       if (this.delegate.amount < 100 || this.delegate.amount == ""){
         this.show = false
       }
+    },
+    download(){
+      return util.download( 'delegate_' + this.delegate.amount + 'ki_tx.json', document, this.delegate.output);
     }
   },
 };
diff --git a/app/src/views/wallet/delegation/modals/redelegate.modal.vue b/app/src/views/wallet/delegation/modals/redelegate.modal.vue
index 467d829..c808e59 100644
--- a/app/src/views/wallet/delegation/modals/redelegate.modal.vue
+++ b/app/src/views/wallet/delegation/modals/redelegate.modal.vue
@@ -107,21 +107,27 @@
         </li>
         <b-row align-v="center" align-h="center">
           <b-col class="text-center">
-            <button
-              class="btn btn-primary"
-              :disabled="tx.loading === true"
-              @click="sendReDelegateTx"
-            >
-              <div v-if="!tx.loading">
-                <span v-if="!multisig">
-                  {{ $t('redelegatetx') }}
-                </span>
-                <span v-else>Generate</span>
-              </div>
-              <div v-else>
-                <b-spinner small label="Small Spinner" />
-              </div>
-            </button>
+            <div v-if="!tx.loading">
+
+            <span v-if="!multisig" >
+              <a class="btn btn-primary" @click="sendReDelegateTx">
+                {{ $t('redelegatetx') }}
+              </a>
+            </span>
+            <span v-else >
+              <a v-if="delegate.output==''" class="btn btn-primary" @click="sendReDelegateTx">
+                Generate
+              </a>
+              <a v-else class="btn btn-download"
+              @click="download()">
+                Download
+              </a>
+            </span>
+          </div>
+
+            <div v-else>
+              <b-spinner small label="Small Spinner" />
+            </div>
           </b-col>
         </b-row>
       </form>
@@ -135,6 +141,7 @@ import { mapActions } from 'vuex';
 import { POST_TX } from '@store/tx';
 import { tokenUtil } from '@static/js/token';
 import FeesInput from '@cmp/tx/fees.input';
+import util from '@static/js/util';
 
 export default {
   components: {
@@ -319,7 +326,10 @@ export default {
         if (flag == 1){ //half
           this.redelegate.amount = Number(Math.round(delegation / 2 + 'e6') + 'e-6')
         }
-    }
+    },
+    download() {
+      return util.download( 'redelegate_' + this.redelegate.amount + 'ki_tx.json', document, this.redelegate.output);
+    },
   },
 };
 </script>
diff --git a/app/src/views/wallet/delegation/modals/undelegate.modal.vue b/app/src/views/wallet/delegation/modals/undelegate.modal.vue
index be868ce..f8f4b70 100644
--- a/app/src/views/wallet/delegation/modals/undelegate.modal.vue
+++ b/app/src/views/wallet/delegation/modals/undelegate.modal.vue
@@ -84,21 +84,27 @@
         </li>
         <b-row align-v="center" align-h="center">
           <b-col class="text-center">
-            <button
-              class="btn btn-primary"
-              :disabled="tx.loading === true"
-              @click="sendUnDelegateTx"
-            >
-              <div v-if="!tx.loading">
-                <span v-if="!multisig">
-                  {{ $t('undelegatetx') }}
-                </span>
-                <span v-else>Generate</span>
-              </div>
-              <div v-else>
-                <b-spinner small label="Small Spinner" />
-              </div>
-            </button>
+            <div v-if="!tx.loading">
+
+            <span v-if="!multisig" >
+              <a class="btn btn-primary" @click="sendUnDelegateTx">
+                {{ $t('undelegatetx') }}
+              </a>
+            </span>
+            <span v-else >
+              <a v-if="delegate.output==''" class="btn btn-primary" @click="sendUnDelegateTx">
+                Generate
+              </a>
+              <a v-else class="btn btn-download"
+              @click="download()">
+                Download
+              </a>
+            </span>
+          </div>
+
+            <div v-else>
+              <b-spinner small label="Small Spinner" />
+            </div>
           </b-col>
         </b-row>
       </form>
@@ -311,7 +317,10 @@ export default {
         if (flag == 1){ //half
           this.undelegate.amount =  Number(Math.round(delegation / 2 + 'e6') + 'e-6')
         }
-    }
+    },
+    download() {
+      return util.download( 'undelegate_' + this.undelegate.amount + 'ki_tx.json', document, this.undelegate.output);
+    },
   },
 };
 </script>
diff --git a/app/src/views/wallet/sign/index.vue b/app/src/views/wallet/sign/index.vue
index 51d9fec..b08d468 100644
--- a/app/src/views/wallet/sign/index.vue
+++ b/app/src/views/wallet/sign/index.vue
@@ -111,6 +111,7 @@
 import { mapActions, mapState } from 'vuex';
 import { services } from '@services/index';
 import { signTx, createBroadcastTx } from '@tendermint/sig';
+import util from '@static/js/util';
 
 export default {
   data() {
@@ -246,21 +247,7 @@ export default {
       }
     },
     downloadSig() {
-      let filename = 'signed_tx.json';
-      let href =
-        'data:text/plain;charset=utf-8,' +
-        encodeURIComponent(this.sign.signature);
-
-      var element = document.createElement('a');
-      element.setAttribute('href', href);
-      element.setAttribute('download', filename);
-
-      element.style.display = 'none';
-      document.body.appendChild(element);
-
-      element.click();
-
-      document.body.removeChild(element);
+      return util.download( "signed_tx.json", document, this.sign.signature);
     },
     async signTxFile() {
       let transaction = JSON.parse(this.sign.file_content).value;
diff --git a/app/src/views/wallet/withdraw/modals/withdraw.modal.vue b/app/src/views/wallet/withdraw/modals/withdraw.modal.vue
index bc02aa4..55afab5 100644
--- a/app/src/views/wallet/withdraw/modals/withdraw.modal.vue
+++ b/app/src/views/wallet/withdraw/modals/withdraw.modal.vue
@@ -77,21 +77,27 @@
         </li>
         <b-row align-v="center" align-h="center">
           <b-col class="text-center">
-            <button
-              class="btn btn-primary"
-              :disabled="tx.loading === true"
-              @click="sendWithdrawTx"
-            >
-              <div v-if="!tx.loading">
-                <span v-if="!multisig">
-                  {{ $t('withdrawtx') }}
-                </span>
-                <span v-else>Generate</span>
-              </div>
-              <div v-else>
-                <b-spinner small label="Small Spinner" />
-              </div>
-            </button>
+            <div v-if="!tx.loading">
+
+            <span v-if="!multisig" >
+              <a class="btn btn-primary" @click="sendWithdrawTx">
+                {{ $t('withdrawtx') }}
+              </a>
+            </span>
+            <span v-else >
+              <a v-if="delegate.output==''" class="btn btn-primary" @click="sendWithdrawTx">
+                Generate
+              </a>
+              <a v-else class="btn btn-download"
+              @click="download()">
+                Download
+              </a>
+            </span>
+          </div>
+
+            <div v-else>
+              <b-spinner small label="Small Spinner" />
+            </div>
           </b-col>
         </b-row>
       </form>
diff --git a/app/static/css/index.css b/app/static/css/index.css
index caf477f..931674f 100644
--- a/app/static/css/index.css
+++ b/app/static/css/index.css
@@ -156,6 +156,7 @@ i {
 
 .btn-download {
   background: #888888;
+  color: #fff !important;
 }
 
 .btn-secondary,
diff --git a/app/static/js/util.js b/app/static/js/util.js
index cf1ca9d..66c635a 100644
--- a/app/static/js/util.js
+++ b/app/static/js/util.js
@@ -275,6 +275,22 @@ class Util {
       'linear-gradient(' + angle + 'deg, ' + newColor1 + ', ' + newColor2 + ')';
     return gradient;
   }
+
+  download(filename, doc, data){
+    let href =
+      'data:text/plain;charset=utf-8,' +
+      encodeURIComponent(data);
+
+    var element = doc.createElement('a');
+    element.setAttribute('href', href);
+    element.setAttribute('download', filename);
+
+    element.style.display = 'none';
+    doc.body.appendChild(element);
+
+    element.click();
+    doc.body.removeChild(element);
+  }
 }
 
 let util = new Util();

From 2b3f3fbdbf503e878c044a6a7bc2d00030f239f3 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Mon, 28 Dec 2020 12:15:29 +0100
Subject: [PATCH 19/23] [Minor] fixed renaming

---
 app/src/components/wallets/modals/edit-wallet.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/components/wallets/modals/edit-wallet.vue b/app/src/components/wallets/modals/edit-wallet.vue
index c302e9a..8731c63 100644
--- a/app/src/components/wallets/modals/edit-wallet.vue
+++ b/app/src/components/wallets/modals/edit-wallet.vue
@@ -213,7 +213,16 @@ export default {
 
       if (this.new_wallet_name != this.wallet.account) {
         localStorage.removeItem(this.wallet.account)
-        localStorage.setItem("wallet_list", localStorage.getItem("wallet_list").replace("," + this.wallet.account + ",", "," + this.new_wallet_name + ","))
+        var old_list = localStorage.getItem("wallet_list").split(',')
+        var index = old_list.indexOf(this.wallet.account);
+
+        if (index !== -1) {
+            old_list[index] = this.new_wallet_name;
+        }
+
+        var new_list = old_list.join(',')
+
+        localStorage.setItem("wallet_list", new_list)
       }
       this.$emit('onUpdateSuccess');
     },

From 57a733ae78be69a75ac3c38a6662e5afaca2b774 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Thu, 31 Dec 2020 09:35:20 +0100
Subject: [PATCH 20/23] Added expand by default for categories

---
 app/src/App.vue                             |  2 +-
 app/src/components/private-layout/index.vue |  2 +-
 app/src/components/wallets/wallet-card.vue  |  4 +-
 app/src/components/wallets/wallets-list.vue | 56 +++++----------------
 app/src/views/login/index.vue               | 21 ++------
 5 files changed, 21 insertions(+), 64 deletions(-)

diff --git a/app/src/App.vue b/app/src/App.vue
index fe3b6a2..5923604 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -139,7 +139,7 @@ export default {
       if (localStorage.getItem('categories')) {
         categories = localStorage.getItem('categories').split(',');
       }else{
-        categories =  ['personal','work','multisignature']
+        categories =  ['personal','work','multisignature','uncategorized']
         localStorage.setItem('categories', categories);
       }
       this.categories = categories.join(",");
diff --git a/app/src/components/private-layout/index.vue b/app/src/components/private-layout/index.vue
index d96a002..386b73d 100644
--- a/app/src/components/private-layout/index.vue
+++ b/app/src/components/private-layout/index.vue
@@ -19,7 +19,7 @@
       </b-col>
     </b-row>
     <b-row class="footer justify-content-md-center align-items-center" :style="{ marginTop: '15px' }">
-      made by <img src="static/img/icons/ki_foundation.png" style="margin-left: 5px; height: 7px; width: auto;"/>
+      <img src="static/img/icons/ki_foundation.png" style="margin-left: 5px; height: 7px; width: auto;"/>
     </b-row>
 
   </div>
diff --git a/app/src/components/wallets/wallet-card.vue b/app/src/components/wallets/wallet-card.vue
index c3d1862..5f4dfbc 100644
--- a/app/src/components/wallets/wallet-card.vue
+++ b/app/src/components/wallets/wallet-card.vue
@@ -150,10 +150,10 @@ export default {
 }
 
 .more{
-  opacity:0.2
+  opacity:0.2;
 }
 
 .more:hover{
-  opacity:0.5
+  opacity:0.5;
 }
 </style>
diff --git a/app/src/components/wallets/wallets-list.vue b/app/src/components/wallets/wallets-list.vue
index 0d8a5b3..b39eddb 100644
--- a/app/src/components/wallets/wallets-list.vue
+++ b/app/src/components/wallets/wallets-list.vue
@@ -92,13 +92,19 @@ export default {
     },
 
     expandDefault() {
-      let el = this.$refs['accordion-body-'+Object.keys(this.categories)[0]][0];
-      this.categories[Object.keys(this.categories)[0]].active = true;
+      console.log(this.categories)
 
-      gsap.to(el, 1, {
-        height: el.scrollHeight,
-        ease: "elastic(1, 0.9)"
-      });
+      for (var i in this.categories){
+        if (this.categories[i].list.length > 0){
+          let el = this.$refs['accordion-body-' + i][0]
+          this.categories[i].active = true;
+
+          gsap.to(el, 1, {
+            height: el.scrollHeight,
+            ease: "elastic(1, 0.9)"
+          });
+        }
+      }
     },
     expand(i) {
       event.preventDefault();
@@ -173,10 +179,6 @@ export default {
 
 }
 
-.accordion-header a:not(.accordion-active):hover {
-  /* background-color: #d8d2ef8f; */
-}
-
 .accordion-header-div {
   padding: 1rem 1rem 1rem 1rem;
 }
@@ -188,18 +190,6 @@ export default {
   justify-content: center;
 }
 
-/* .accordion-caret {
-	background-image: linear-gradient(
-  	to top right,
-  	transparent 50%,
-  	#727272 50%
-  );
-	width: 0.5rem;
-	height: 0.5rem;
-	transform: rotate(-45deg);
-	animation: accordion-is-inactive 200ms linear forwards;
-} */
-
 .accordion-body {
   height: 0;
   overflow: hidden;
@@ -209,27 +199,5 @@ export default {
   padding: 1rem;
 }
 
-/* @keyframes accordion-is-inactive {
-	0%   { transform: rotate(-45deg); }
-	50%  { transform: scale(1.5) rotate(45deg); }
-	100% { transform: rotate(135deg); }
-}
-
-@keyframes accordion-is-active {
-	0%   { transform: rotate(135deg); }
-	50%  { transform: scale(1.5) rotate(45deg); }
-	100% { transform:  rotate(-45deg); }
-} */
 
-@media screen and (min-width: var(--base-width) {
-    #app {
-      padding: 2rem;
-      overflow: auto;
-    }
-
-    .accordion {
-      max-height: none;
-      border-radius: 0.5rem;
-    }
-  }
 </style>
diff --git a/app/src/views/login/index.vue b/app/src/views/login/index.vue
index 24d79e1..c0d6c97 100644
--- a/app/src/views/login/index.vue
+++ b/app/src/views/login/index.vue
@@ -267,27 +267,16 @@ export default {
       this.password_correct = true;
     },
 
-    // getwallets() {
-    //   if (localStorage.getItem('wallet_list')) {
-    //     let wallet_list = localStorage.getItem('wallet_list').split(',');
-    //     for (var w in wallet_list) {
-    //       this.wallets.push([
-    //         wallet_list[w],
-    //         JSON.parse(localStorage.getItem(wallet_list[w])).address,
-    //       ]);
-    //     }
-    //   }
-    // },
-
     getCategories(){
-      let categories = 'personal,work,multisignature';
+      let categories = [];
       if (localStorage.getItem('categories')) {
         categories = localStorage.getItem('categories').split(',');
       }else{
-        // categories = 'personal,work,uncategorized'
-        localStorage.setItem('categories', 'personal,work,multisignature');
+        categories =  ['personal','work','multisignature','uncategorized']
+        localStorage.setItem('categories', categories);
       }
-      setCategoryList(categories);
+      this.categories = categories.join(",");
+      this.setCategoryList(categories);
     },
 
     login() {

From fc2210ed5627fe2efeefbcc0d3d4d8ba4765a4e5 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Mon, 4 Jan 2021 12:41:56 +0100
Subject: [PATCH 21/23] Updated package files + minor fixes

---
 app/package-lock.json                         | 62 ++++++++++++-------
 app/package.json                              |  6 +-
 .../components/wallets/modals/edit-wallet.vue |  8 ++-
 app/src/components/wallets/wallets-list.vue   |  4 +-
 app/src/store/wallets/actions.js              |  2 +-
 main.js                                       |  4 +-
 package.json                                  |  2 +-
 splashscreen.html                             |  2 +-
 8 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/app/package-lock.json b/app/package-lock.json
index 01d9c69..e55424f 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -2768,9 +2768,9 @@
       }
     },
     "core-js": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz",
-      "integrity": "sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.1.tgz",
+      "integrity": "sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg==",
       "optional": true
     },
     "core-util-is": {
@@ -4241,9 +4241,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "12.19.5",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.5.tgz",
-          "integrity": "sha512-Wgdl27uw/jUYUFyajUGKSjDNGxmJrZi9sjeG6UJImgUtKbJoO9aldx+1XODN1EpNDX9DirvbvHHmTsNlb8GwMA=="
+          "version": "12.19.11",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.11.tgz",
+          "integrity": "sha512-bwVfNTFZOrGXyiQ6t4B9sZerMSShWNsGRw8tC5DY1qImUNczS9SjT4G6PnzjCnxsu5Ubj6xjL2lgwddkxtQl5w=="
         }
       }
     },
@@ -6299,10 +6299,28 @@
         "serialize-error": "^7.0.1"
       },
       "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "optional": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "semver": {
-          "version": "7.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "optional": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
           "optional": true
         }
       }
@@ -6420,6 +6438,11 @@
       "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
       "dev": true
     },
+    "gsap": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.5.1.tgz",
+      "integrity": "sha512-EMV0RSUKZNeTUzLKAizGlwxVOUyif3/g8I3S1aA/hf3gbqwBvmQ02x1RdTBQNQMOpHCVBv9y/vaHwfctoAg8zw=="
+    },
     "gzip-size": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
@@ -14125,11 +14148,6 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
     },
-    "v-click-outside": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/v-click-outside/-/v-click-outside-2.1.5.tgz",
-      "integrity": "sha512-VPNCOTZK6WZy73lcWc+R7IW1uaBFEO3/Csrs5CzWVOdvE30V8Y1+BE/BtTlcEmeDGx0eqdE7bSCg55Jj37PMJg=="
-    },
     "v8-compile-cache": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
@@ -14192,6 +14210,14 @@
         "loose-envify": "^1.2.0"
       }
     },
+    "vue-clipboard2": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.1.tgz",
+      "integrity": "sha512-H5S/agEDj0kXjUb5GP2c0hCzIXWRBygaWLN3NEFsaI9I3uWin778SFEMt8QRXiPG+7anyjqWiw2lqcxWUSfkYg==",
+      "requires": {
+        "clipboard": "^2.0.0"
+      }
+    },
     "vue-context": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/vue-context/-/vue-context-5.2.0.tgz",
@@ -14422,14 +14448,6 @@
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.6.tgz",
       "integrity": "sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA=="
     },
-    "vue-simple-context-menu": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/vue-simple-context-menu/-/vue-simple-context-menu-3.1.10.tgz",
-      "integrity": "sha512-kf+6PhzX0IGtqOdEsAe8A5eK0DzDpLwtZKDXii2HcmPeqK3a6XBA9DkZOTUuKGw/seMqyICTHnPXLne0p73Kvw==",
-      "requires": {
-        "v-click-outside": "^2.1.3"
-      }
-    },
     "vue-style-loader": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.1.2.tgz",
diff --git a/app/package.json b/app/package.json
index 04865a2..3a957ee 100644
--- a/app/package.json
+++ b/app/package.json
@@ -24,6 +24,7 @@
     "crypto-js": "^4.0.0",
     "electron": ">=8.5.2",
     "es6-promise": "^4.2.8",
+    "gsap": "^3.5.1",
     "jquery": "^3.4.1",
     "kind-of": ">=6.0.3",
     "minimist": ">=0.2.1",
@@ -31,6 +32,7 @@
     "popper.js": "^1.15.0",
     "request": "^2.88.2",
     "vue": "^2.5.2",
+    "vue-clipboard2": "^0.3.1",
     "vue-context": "^5.2.0",
     "vue-cookie": "^1.1.4",
     "vue-foldable": "^1.0.0",
@@ -38,12 +40,10 @@
     "vue-js-toggle-button": "^1.3.3",
     "vue-resource": "^1.5.1",
     "vue-router": "^3.0.1",
-    "vue-simple-context-menu": "^3.1.10",
     "vue-unicons": "^2.1.0",
     "vuex": "^3.3.0"
   },
   "devDependencies": {
-    "acorn": ">=5.7.4",
     "autoprefixer": "^7.1.2",
     "babel-core": "^6.22.1",
     "babel-eslint": "^10.1.0",
@@ -68,10 +68,8 @@
     "friendly-errors-webpack-plugin": "^1.6.1",
     "html-webpack-plugin": "^2.30.1",
     "js-yaml": ">=3.13.1",
-    "kind-of": ">=6.0.3",
     "lodash": ">=4.17.19",
     "mem": ">=4.0.0",
-    "minimist": ">=0.2.1",
     "mixin-deep": ">=1.3.2",
     "node-notifier": "^5.1.2",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
diff --git a/app/src/components/wallets/modals/edit-wallet.vue b/app/src/components/wallets/modals/edit-wallet.vue
index 8731c63..c99ce5b 100644
--- a/app/src/components/wallets/modals/edit-wallet.vue
+++ b/app/src/components/wallets/modals/edit-wallet.vue
@@ -199,8 +199,12 @@ export default {
       this.new_wallet_categroy = cat;
     },
     editCategories() {
-      localStorage.setItem('categories', this.categories_.split(','))
-      this.setCategoryList(this.categories_.split(','))
+      var categories_a = this.categories_.split(',')
+      if (!this.categories_.includes("uncategorized")){
+        categories_a.push("uncategorized")
+      }
+      localStorage.setItem('categories', categories_a)
+      this.setCategoryList(categories_a)
     },
     updateWallet() {
       var updated_wallet = JSON.parse(localStorage.getItem(this.wallet.account))
diff --git a/app/src/components/wallets/wallets-list.vue b/app/src/components/wallets/wallets-list.vue
index b39eddb..3acfac5 100644
--- a/app/src/components/wallets/wallets-list.vue
+++ b/app/src/components/wallets/wallets-list.vue
@@ -82,7 +82,7 @@ export default {
   methods: {
     splitCategories() {
       for (var wallet of this.list) {
-        if(wallet.category!=undefined){
+        if(wallet.category!=undefined && wallet.category in this.categories){
           this.categories[wallet.category].list.push(wallet);
         }
         else{
@@ -92,8 +92,6 @@ export default {
     },
 
     expandDefault() {
-      console.log(this.categories)
-
       for (var i in this.categories){
         if (this.categories[i].list.length > 0){
           let el = this.$refs['accordion-body-' + i][0]
diff --git a/app/src/store/wallets/actions.js b/app/src/store/wallets/actions.js
index ccfd71e..b890b74 100644
--- a/app/src/store/wallets/actions.js
+++ b/app/src/store/wallets/actions.js
@@ -297,7 +297,7 @@ export const actions = {
         }
       }
 
-      let balances = {"available":tokenUtil.format(available), "delegated":tokenUtil.format(delegated), "unbonding":tokenUtil.format(unbonding), "available_real":tokenUtil.format(available_real), "locked":tokenUtil.format(locked), "total":tokenUtil.format(available + delegated + locked), "denom":state.app.denom }
+      let balances = {"available":tokenUtil.format(available), "delegated":tokenUtil.format(delegated), "unbonding":tokenUtil.format(unbonding), "available_real":tokenUtil.format(available_real), "locked":tokenUtil.format(locked), "total":tokenUtil.format(available + delegated), "denom":state.app.denom }
 
       if (responseBalances.data.result) {
         walletTmp = {
diff --git a/main.js b/main.js
index d3932e8..cc626c4 100644
--- a/main.js
+++ b/main.js
@@ -8,9 +8,9 @@ function createWindow() {
   // Create the browser window.
   const mainWindow = new BrowserWindow({
     // backgroundColor: '#043bea',
-    width: 1200,
+    width: 1100,
     height: 810,
-    minWidth: 1200,
+    minWidth: 1100,
     // minWidth: 900,
     show: false,
     // frame:false,
diff --git a/package.json b/package.json
index 4f015df..701c00f 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "package-mac": "electron-packager . --overwrite --platform=darwin --arch=x64 --icon=assets/icons/mac/icon.icns --prune=true --out=release-builds --ignore=^/app --ignore=^/installers",
     "package-linux": "electron-packager . ki-desktop-wallet --overwrite --platform=linux --asar=true --arch=x64 --icon=assets/icons/linux/icon.png --prune=true --out=release-builds --ignore=^/app --ignore=^/installers --executableName=ki-desktop-wallet ",
     "package-win": "electron-packager . --overwrite --platform=win32 --arch=ia32 --icon=assets/icons/win/icon.png --prune=true --out=release-builds --ignore=^/app --ignore=^/installers --asar",
-    "build-installer-mac": "dmgbuild -s installers/config/macos/settings.py 'Ki Wallet Installer' installers/output/macos/ki-desktop-wallet-0.2.2-macos.dmg",
+    "build-installer-mac": "dmgbuild -s installers/config/macos/settings.py 'Ki Wallet Installer' installers/output/macos/ki-desktop-wallet-0.3.0-macos.dmg",
     "build-installer-linux": "electron-installer-debian --src ./release-builds/ki-desktop-wallet-linux-x64/ --arch amd64 --config installers/config/debian/debian.json --dest installers/output/debian/",
     "build-installer-win": "node installers/config/windows/createinstaller.js"
   },
diff --git a/splashscreen.html b/splashscreen.html
index 900c39b..27af587 100644
--- a/splashscreen.html
+++ b/splashscreen.html
@@ -63,7 +63,7 @@
     </div>
     <div class="footer ">
       <span>
-        0.3.0 beta
+        0.3.0
       </span>
     </div>
 

From ca01435a6e6a4b81284b6634a5d8bd5c9d790071 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Tue, 5 Jan 2021 17:59:38 +0100
Subject: [PATCH 22/23] Fixed wallet balance refresh

---
 .../private-layout/topbar/wallet-actions.vue         |  2 ++
 .../wallet/delegation/modals/redelegate.modal.vue    |  5 ++++-
 app/src/views/wallet/multisign/index.vue             | 12 +++++++-----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/src/components/private-layout/topbar/wallet-actions.vue b/app/src/components/private-layout/topbar/wallet-actions.vue
index 83dd639..f812a89 100644
--- a/app/src/components/private-layout/topbar/wallet-actions.vue
+++ b/app/src/components/private-layout/topbar/wallet-actions.vue
@@ -131,6 +131,8 @@ export default {
       await this.hydrateCurrentWallet(this.currentWallet);
       await this.fetchAllValidators();
       await this.fetchWalletRewards();
+      this.total_available = tokenUtil.formatShort(numeral(this.currentWalletBalancesAmount.available).value() * Math.pow(10,6));
+      this.total_usd = tokenUtil.formatShort(numeral(this.currentWalletBalancesAmount.available).value() * Math.pow(10,6) * this.token_price);
       this.refreshing = false;
     },
     toggleCopiedTooltip() {},
diff --git a/app/src/views/wallet/delegation/modals/redelegate.modal.vue b/app/src/views/wallet/delegation/modals/redelegate.modal.vue
index c808e59..a1eb813 100644
--- a/app/src/views/wallet/delegation/modals/redelegate.modal.vue
+++ b/app/src/views/wallet/delegation/modals/redelegate.modal.vue
@@ -31,7 +31,7 @@
           />
           <datalist id="validator_unbond_list">
             <option
-              v-for="(item, index) in currentWallet.validators"
+              v-for="(item, index) in validators"
               :key="index"
               :value="item.operator_address"
             >
@@ -202,6 +202,9 @@ export default {
     tx() {
       return this.$store.state.tx;
     },
+    validators(){
+      return this.$store.state.validators.list;
+    }
   },
   methods: {
     ...mapActions({
diff --git a/app/src/views/wallet/multisign/index.vue b/app/src/views/wallet/multisign/index.vue
index b340546..4dc822a 100644
--- a/app/src/views/wallet/multisign/index.vue
+++ b/app/src/views/wallet/multisign/index.vue
@@ -365,7 +365,7 @@ export default {
 
     async broadcastTx(){
       const bcTransactionme = createBroadcastTx(this.multisign.signature_obj);
-
+      var success = false
       try {
         const responsePostTransfer = await services.tx.postTx(bcTransactionme);
         this.$bvToast.toast('Transaction sent with success', {
@@ -375,10 +375,9 @@ export default {
           solid: true,
           toaster: 'b-toaster-bottom-center',
         });
-        removeFile('msf', '')
-        this.$emit('onTransferSuccess');
+        success = true;
+        // this.$emit('onTransferSuccess');
       } catch (error) {
-
         this.$bvToast.toast("Failed to send", {
           variant: 'danger',
           autoHideDelay: 2000,
@@ -386,7 +385,10 @@ export default {
           noCloseButton: true,
           toaster: 'b-toaster-bottom-center',
         });
-        this.$emit('onTransferError');
+        // this.$emit('onTransferError');
+      }
+      if (success){
+        this.removeFile('msf', '')
       }
     }
   }

From 5b7e5decb33d89a20c4b9d53271873ad9de271f9 Mon Sep 17 00:00:00 2001
From: Tarek Awwad <tarek.awwad.36@gmail.com>
Date: Wed, 6 Jan 2021 09:37:13 +0100
Subject: [PATCH 23/23] Bump axios version

---
 app/package-lock.json | 23 +++++++++++++++++++----
 app/package.json      |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/package-lock.json b/app/package-lock.json
index e55424f..96aad0d 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -657,11 +657,18 @@
       "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="
     },
     "axios": {
-      "version": "0.19.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
-      "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
       "requires": {
-        "follow-redirects": "1.5.10"
+        "follow-redirects": "^1.10.0"
+      },
+      "dependencies": {
+        "follow-redirects": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz",
+          "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="
+        }
       }
     },
     "babel-code-frame": {
@@ -13776,6 +13783,14 @@
         "uuid": "^3.3.2"
       },
       "dependencies": {
+        "axios": {
+          "version": "0.19.2",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
+          "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+          "requires": {
+            "follow-redirects": "1.5.10"
+          }
+        },
         "coa": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
diff --git a/app/package.json b/app/package.json
index 3a957ee..ab86689 100644
--- a/app/package.json
+++ b/app/package.json
@@ -16,7 +16,7 @@
     "@fortawesome/vue-fontawesome": "^0.1.9",
     "@tendermint/sig": "^0.4.1",
     "acorn": ">=5.7.4",
-    "axios": "^0.19.2",
+    "axios": "^0.21.1",
     "bip39": "^3.0.2",
     "bootstrap": "^4.4.1",
     "bootstrap-vue": "^2.12.0",