feat: add icon indicator for multisig wallets (#1877)

ArkEcosystem · Apr 9, 2020 · 4834c55 · 4834c55
1 parent 5069a12
commit 4834c55
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 32 deletions.
diff --git a/src/renderer/assets/svg/multi-signature.svg b/src/renderer/assets/svg/multi-signature.svg
diff --git a/src/renderer/components/Wallet/WalletGrid.vue b/src/renderer/components/Wallet/WalletGrid.vue
@@ -69,41 +69,51 @@
               </div>
             </div>
 
-            <MenuDropdown
-              :ref="`dropdown-${wallet.id}`"
-              :items="contextMenuOptions(wallet)"
-              :is-highlighting="false"
-              :position="{ x: '100%', y: '-0.5rem' }"
-              :container-classes="'hidden group-hover:block'"
-              @select="onSelectDropdown(wallet, $event)"
-            >
-              <span
-                slot="handler"
-                class="WalletGrid__wallet__select p-2 text-theme-page-text-light hover:text-theme-page-text opacity-75"
-              >
-                <SvgIcon
-                  name="more"
-                  view-box="0 0 5 15"
-                  class="text-inherit"
-                />
-              </span>
+            <div class="flex items-center">
+              <SvgIcon
+                v-if="wallet.multiSignature"
+                v-tooltip="$t('PAGES.WALLET.MULTI_SIGNATURE_WALLET')"
+                class="w-5 h-5 text-theme-heading-text mr-2"
+                name="multi-signature"
+                view-box="0 0 16 16"
+              />
 
-              <template
-                slot="item"
-                slot-scope="itemScope"
+              <MenuDropdown
+                :ref="`dropdown-${wallet.id}`"
+                :items="contextMenuOptions(wallet)"
+                :is-highlighting="false"
+                :position="{ x: '100%', y: '-0.5rem' }"
+                :container-classes="'hidden group-hover:block'"
+                @select="onSelectDropdown(wallet, $event)"
               >
-                <div class="flex items-center hidden">
+                <span
+                  slot="handler"
+                  class="WalletGrid__wallet__select p-2 text-theme-page-text-light hover:text-theme-page-text opacity-75"
+                >
                   <SvgIcon
-                    :name="itemScope.item.icon"
-                    view-box="0 0 16 16"
-                    class="text-inherit flex-none mr-2"
+                    name="more"
+                    view-box="0 0 5 15"
+                    class="text-inherit"
                   />
-                  <span class="font-semibold">
-                    {{ itemScope.item.value }}
-                  </span>
-                </div>
-              </template>
-            </MenuDropdown>
+                </span>
+
+                <template
+                  slot="item"
+                  slot-scope="itemScope"
+                >
+                  <div class="flex items-center hidden">
+                    <SvgIcon
+                      :name="itemScope.item.icon"
+                      view-box="0 0 16 16"
+                      class="text-inherit flex-none mr-2"
+                    />
+                    <span class="font-semibold">
+                      {{ itemScope.item.value }}
+                    </span>
+                  </div>
+                </template>
+              </MenuDropdown>
+            </div>
           </div>
         </div>
       </div>

diff --git a/src/renderer/components/Wallet/WalletHeading/WalletHeadingPrimaryActions.vue b/src/renderer/components/Wallet/WalletHeading/WalletHeadingPrimaryActions.vue
@@ -3,6 +3,14 @@
     key="PrimaryActions"
     class="WalletHeading__PrimaryActions flex items-center"
   >
+    <SvgIcon
+      v-if="currentWallet.multiSignature"
+      v-tooltip="$t('PAGES.WALLET.MULTI_SIGNATURE_WALLET')"
+      class="w-5 h-5 text-theme-heading-text opacity-50"
+      name="multi-signature"
+      view-box="0 0 16 16"
+    />
+
     <button
       v-tooltip="{
         content: isVoting ? $t('PAGES.WALLET_SHOW.VOTING_FOR', { delegate: walletVote.username }) : $t('PAGES.WALLET_SHOW.NO_VOTE'),
@@ -106,6 +114,7 @@ import { ButtonDropdown, ButtonModal, ButtonReload } from '@/components/Button'
 import { ModalQrCode } from '@/components/Modal'
 import { TransactionModal } from '@/components/Transaction'
 import { ContactRenameModal } from '@/components/Contact'
+import SvgIcon from '@/components/SvgIcon'
 
 export default {
   name: 'WalletHeadingPrimaryActions',
@@ -118,7 +127,8 @@ export default {
     ButtonReload,
     ModalQrCode,
     TransactionModal,
-    ContactRenameModal
+    ContactRenameModal,
+    SvgIcon
   },
 
   data () {

diff --git a/src/renderer/components/Wallet/WalletTable.vue b/src/renderer/components/Wallet/WalletTable.vue
@@ -57,6 +57,21 @@
           </span>
         </div>
 
+        <div
+          v-else-if="data.column.field === 'multisignature'"
+          class="flex items-center justify-center"
+        >
+          <span>
+            <SvgIcon
+              v-if="data.row.multiSignature"
+              v-tooltip="$t('PAGES.WALLET.MULTI_SIGNATURE_WALLET')"
+              class="w-5 h-5 text-theme-heading-text"
+              name="multi-signature"
+              view-box="0 0 16 16"
+            />
+          </span>
+        </div>
+
         <div
           v-else-if="data.column.field === 'vote'"
         >
@@ -176,6 +191,13 @@ export default {
           thClass: !this.showVotedDelegates ? 'w-full' : '',
           tdClass: !this.showVotedDelegates ? 'w-full' : ''
         },
+        {
+          label: '',
+          field: 'multisignature',
+          sortable: false,
+          thClass: 'text-center not-sortable',
+          tdClass: 'text-center'
+        },
         {
           label: this.$t('PAGES.WALLET_ALL.VOTING_FOR'),
           field: 'vote',

diff --git a/src/renderer/i18n/locales/en-US.js b/src/renderer/i18n/locales/en-US.js
@@ -795,6 +795,7 @@ export default {
       DELEGATES: 'Delegates',
       IPFS: 'IPFS',
       MULTI_SIGNATURE: 'Multisignature',
+      MULTI_SIGNATURE_WALLET: 'Multisignature wallet',
       STATISTICS: 'Statistics',
       SIGN_VERIFY: 'Sign',
       PURCHASE: 'Purchase {ticker}'