From a592e0ed1611a928f72ce925f2ad94a3b05b4b91 Mon Sep 17 00:00:00 2001
From: donne1226 <503124742@qq.com>
Date: Tue, 29 Mar 2022 23:25:32 +0800
Subject: [PATCH 1/6] fix

---
 .../OperationModal/components/Delegate.vue    |  9 ----
 .../OperationModal/components/Withdraw.vue    | 53 ++-----------------
 2 files changed, 5 insertions(+), 57 deletions(-)

diff --git a/src/views/components/OperationModal/components/Delegate.vue b/src/views/components/OperationModal/components/Delegate.vue
index 2c4d718a..bc4138c2 100644
--- a/src/views/components/OperationModal/components/Delegate.vue
+++ b/src/views/components/OperationModal/components/Delegate.vue
@@ -11,15 +11,7 @@
             rules="required"
             name="Delegator"
           >
-            <b-form-select
-              v-if="account.length > 0"
-              v-model="selectedAddress"
-              :options="account"
-              text-field="label"
-              @change="onChange"
-            />
             <b-form-input
-              v-else
               v-model="selectedAddress"
               readonly
             />
@@ -176,7 +168,6 @@ export default {
       digits,
       length,
       alphaDash,
-      account: [],
     }
   },
   computed: {
diff --git a/src/views/components/OperationModal/components/Withdraw.vue b/src/views/components/OperationModal/components/Withdraw.vue
index f4a2e81d..666d3bea 100644
--- a/src/views/components/OperationModal/components/Withdraw.vue
+++ b/src/views/components/OperationModal/components/Withdraw.vue
@@ -7,16 +7,8 @@
           label-for="Account"
         >
           <b-input-group class="mb-25">
-            <b-input-group-prepend is-text>
-              <b-avatar
-                :src="account?account.logo:''"
-                size="18"
-                variant="light-primary"
-                rounded
-              />
-            </b-input-group-prepend>
             <b-form-input
-              :value="account?account.addr:address"
+              :value="address"
               readonly
             />
           </b-input-group>
@@ -28,15 +20,11 @@
 
 <script>
 import {
-  BRow, BCol, BInputGroup, BFormInput, BAvatar, BFormGroup,
-  BInputGroupPrepend,
+  BRow, BCol, BInputGroup, BFormInput, BFormGroup,
 } from 'bootstrap-vue'
 import {
   required, email, url, between, alpha, integer, password, min, digits, alphaDash, length,
 } from '@validations'
-import {
-  getLocalAccounts, getLocalChains,
-} from '@/libs/utils'
 
 export default {
   name: 'WithdrawDialogue',
@@ -44,9 +32,7 @@ export default {
     BRow,
     BCol,
     BInputGroup,
-    BInputGroupPrepend,
     BFormInput,
-    BAvatar,
     BFormGroup,
   },
   props: {
@@ -96,45 +82,16 @@ export default {
       modalTitle: 'Withdraw Rewards',
       historyName: 'withdraw',
     })
-    this.loadBalance()
+    this.loadData()
   },
 
   methods: {
-    loadBalance() {
-      this.account = this.computeAccount()
-      if (this.account && this.account.length > 0) this.address = this.account[0].addr
-      if (this.address) {
-        this.$http.getBankBalances(this.address).then(res => {
-          if (res && res.length > 0) {
-            this.balance = res.reverse()
-            const token = this.balance.find(i => !i.denom.startsWith('ibc'))
-            if (token) this.feeDenom = token.denom
-          }
-        })
-      }
+    loadData() {
       this.$http.getStakingDelegations(this.address).then(res => {
+        console.log(res)
         this.delegations = res.delegation_responses
       })
     },
-    computeAccount() {
-      const accounts = getLocalAccounts()
-      const chains = getLocalChains()
-      if (accounts) {
-        const values = Object.values(accounts)
-        for (let i = 0; i < values.length; i += 1) {
-          const addr = values[i].address.find(x => x.addr === this.address)
-          if (addr) {
-            this.selectedChain = chains[addr.chain]
-            this.$emit('update', {
-              selectedChain: chains[addr.chain],
-            })
-            return addr
-          }
-        }
-      }
-      return null
-    },
-
   },
 }
 </script>

From f99f0093b9b35aa817ae3d9ae33a176112525df3 Mon Sep 17 00:00:00 2001
From: donne1226 <503124742@qq.com>
Date: Wed, 30 Mar 2022 21:50:49 +0800
Subject: [PATCH 2/6] fix redelegate

---
 .../OperationModal/components/Redelegate.vue  | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/views/components/OperationModal/components/Redelegate.vue b/src/views/components/OperationModal/components/Redelegate.vue
index fd70b536..0795f5cb 100644
--- a/src/views/components/OperationModal/components/Redelegate.vue
+++ b/src/views/components/OperationModal/components/Redelegate.vue
@@ -147,13 +147,7 @@ export default {
       toValidator: null,
       token: '',
       amount: null,
-      balance: [],
       delegations: [],
-      feeDenom: '',
-      error: null,
-      sequence: 1,
-      accountNumber: 0,
-      account: [],
 
       required,
       password,
@@ -170,9 +164,18 @@ export default {
   },
   computed: {
     valOptions() {
+      let options = []
       const vals = this.validators.map(x => ({ value: x.operator_address, label: `${x.description.moniker} (${Number(x.commission.rate) * 100}%)` }))
+      if (vals.length > 0) {
+        options.push({ value: null, label: '=== ACTIVE VALIDATORS ===' })
+        options = options.concat(vals)
+      }
       const unbunded = this.unbundValidators.map(x => ({ value: x.operator_address, label: `* ${x.description.moniker} (${Number(x.commission.rate) * 100}%)` }))
-      return vals.concat(unbunded)
+      if (unbunded.length > 0) {
+        options.push({ value: null, label: '=== INACTIVE VALIDATORS ===', disabled: true })
+        options = options.concat(unbunded)
+      }
+      return options
     },
     tokenOptions() {
       if (!this.delegations) return []
@@ -198,24 +201,16 @@ export default {
       modalTitle: 'Redelegate Token',
       historyName: 'redelegate',
     })
-    this.loadBalance()
+    this.loadData()
   },
   methods: {
-    printDenom() {
-      return formatTokenDenom(this.token)
-    },
-    loadBalance() {
+    loadData() {
       this.$http.getValidatorList().then(v => {
         this.validators = v
       })
       this.$http.getValidatorUnbondedList().then(v => {
         this.unbundValidators = v
       })
-      this.$http.getBankBalances(this.address).then(res => {
-        if (res && res.length > 0) {
-          this.balance = res.reverse()
-        }
-      })
       this.$http.getStakingDelegations(this.address).then(res => {
         this.delegations = res.delegation_responses
         console.log(res)
@@ -233,7 +228,9 @@ export default {
     format(v) {
       return formatToken(v)
     },
-
+    printDenom() {
+      return formatTokenDenom(this.token)
+    },
   },
 }
 </script>

From 3d44d1d9f93f3d13a0cd14be518cd5194c61928f Mon Sep 17 00:00:00 2001
From: donne1226 <503124742@qq.com>
Date: Wed, 30 Mar 2022 23:11:24 +0800
Subject: [PATCH 3/6] fix

---
 src/views/WalletAccountDetail.vue             |  12 ++
 .../OperationModal/components/Redelegate.vue  |   2 +-
 .../OperationModal/components/Transfer.vue    | 204 ++++++++++++++++++
 .../OperationModal/components/Unbond.vue      |  18 +-
 src/views/components/OperationModal/index.vue |   2 +
 5 files changed, 224 insertions(+), 14 deletions(-)
 create mode 100644 src/views/components/OperationModal/components/Transfer.vue

diff --git a/src/views/WalletAccountDetail.vue b/src/views/WalletAccountDetail.vue
index 9469c13e..b0ad742f 100644
--- a/src/views/WalletAccountDetail.vue
+++ b/src/views/WalletAccountDetail.vue
@@ -49,6 +49,18 @@
            />
             <span class="d-none d-md-block">Transfer</span>
           </b-button>
+          <b-button
+            v-b-modal.operation-modal
+            variant="primary"
+            size="sm"
+            class="mr-25"
+            @click="setOperationModalType('Transfer')"
+          >
+            <feather-icon
+              icon="SendIcon"
+              class="d-md-none"
+            /><small class="d-none d-md-block">Transfer1</small>
+          </b-button>
           <b-button
             v-b-modal.ibc-transfer-window
             variant="danger"
diff --git a/src/views/components/OperationModal/components/Redelegate.vue b/src/views/components/OperationModal/components/Redelegate.vue
index 0795f5cb..921636e5 100644
--- a/src/views/components/OperationModal/components/Redelegate.vue
+++ b/src/views/components/OperationModal/components/Redelegate.vue
@@ -68,6 +68,7 @@
             :options="valOptions"
             :reduce="val => val.value"
             placeholder="Select a validator"
+            :selectable="(v) => v.value"
           />
         </b-form-group>
       </b-col>
@@ -213,7 +214,6 @@ export default {
       })
       this.$http.getStakingDelegations(this.address).then(res => {
         this.delegations = res.delegation_responses
-        console.log(res)
         this.delegations.forEach(x => {
           if (x.delegation.validator_address === this.validatorAddress) {
             this.token = x.balance.denom
diff --git a/src/views/components/OperationModal/components/Transfer.vue b/src/views/components/OperationModal/components/Transfer.vue
new file mode 100644
index 00000000..53bc5d4c
--- /dev/null
+++ b/src/views/components/OperationModal/components/Transfer.vue
@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <b-row>
+      <b-col>
+        <b-form-group
+          label="Sender"
+          label-for="sender"
+        >
+          <b-input-group class="mb-25">
+
+            <b-form-input
+              name="sender"
+              :value="address"
+              readonly
+            />
+          </b-input-group>
+        </b-form-group>
+      </b-col>
+    </b-row>
+    <b-row>
+      <b-col>
+        <b-form-group
+          label="Recipient"
+          label-for="Recipient"
+        >
+          <validation-provider
+            #default="{ errors }"
+            rules="required"
+            name="recipient"
+          >
+            <b-input-group class="mb-25">
+              <b-form-input
+                id="Recipient"
+                v-model="recipient"
+                :state="errors.length > 0 ? false:null"
+              />
+            </b-input-group>
+            <small class="text-danger">{{ errors[0] }}</small>
+          </validation-provider>
+        </b-form-group>
+      </b-col>
+    </b-row>
+    <b-row>
+      <b-col>
+        <b-form-group
+          label="Available Token"
+          label-for="Token"
+        >
+          <validation-provider
+            #default="{ errors }"
+            rules="required"
+            name="Token"
+          >
+            <b-form-select
+              v-model="token"
+            >
+              <b-form-select-option
+                v-for="item in balanceOptions"
+                :key="item.denom"
+                :value="item.denom"
+              >
+                {{ format(item) }}
+              </b-form-select-option>
+            </b-form-select>
+            <small class="text-danger">{{ errors[0] }}</small>
+          </validation-provider>
+        </b-form-group>
+      </b-col>
+    </b-row>
+    <b-row>
+      <b-col>
+        <b-form-group
+          label="Amount"
+          label-for="Amount"
+        >
+          <validation-provider
+            v-slot="{ errors }"
+            rules="required|regex:^([0-9\.]+)$"
+            name="amount"
+          >
+            <b-input-group class="mb-25">
+              <b-form-input
+                id="Amount"
+                v-model="amount"
+                :state="errors.length > 0 ? false:null"
+                placeholder="Input a number"
+                type="number"
+              />
+              <b-input-group-append is-text>
+                {{ printDenom() }}
+              </b-input-group-append>
+            </b-input-group>
+            <small class="text-danger">{{ errors[0] }}</small>
+          </validation-provider>
+        </b-form-group>
+      </b-col>
+    </b-row>
+  </div>
+</template>
+
+<script>
+import { ValidationProvider } from 'vee-validate'
+import {
+  BRow, BCol, BInputGroup, BInputGroupAppend, BFormInput, BFormGroup, BFormSelect, BFormSelectOption,
+} from 'bootstrap-vue'
+import {
+  required, email, url, between, alpha, integer, password, min, digits, alphaDash, length,
+} from '@validations'
+import {
+  formatToken, formatTokenDenom, getUnitAmount,
+} from '@/libs/utils'
+
+export default {
+  name: 'TransforDialogue',
+  components: {
+    BRow,
+    BCol,
+    BInputGroup,
+    BInputGroupAppend,
+    BFormInput,
+    BFormGroup,
+    BFormSelect,
+    BFormSelectOption,
+    ValidationProvider,
+
+  },
+  props: {
+    address: {
+      type: String,
+      default: '',
+    },
+    balance: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      token: '',
+      amount: null,
+      recipient: '',
+      IBCDenom: {},
+
+      required,
+      password,
+      email,
+      min,
+      integer,
+      url,
+      alpha,
+      between,
+      digits,
+      length,
+      alphaDash,
+    }
+  },
+  computed: {
+    msg() {
+      return [
+        {
+          typeUrl: '/cosmos.bank.v1beta1.MsgSend',
+          value: {
+            fromAddress: this.address,
+            toAddress: this.recipient,
+            amount: [
+              {
+                amount: getUnitAmount(this.amount, this.token),
+                denom: this.token,
+              },
+            ],
+          },
+        },
+      ]
+    },
+    balanceOptions() {
+      return this.setupBalance()
+    },
+  },
+  mounted() {
+    this.$emit('update', {
+      modalTitle: 'Transfer Tokens',
+      historyName: 'send',
+    })
+  },
+
+  methods: {
+    setupBalance() {
+      if (this.balance && this.balance.length > 0) {
+        this.token = this.balance[0].denom
+        return this.balance
+      }
+      return []
+    },
+    format(v) {
+      return formatToken(v, this.IBCDenom)
+    },
+    printDenom() {
+      return formatTokenDenom(this.IBCDenom[this.token] || this.token)
+    },
+
+  },
+
+}
+</script>
diff --git a/src/views/components/OperationModal/components/Unbond.vue b/src/views/components/OperationModal/components/Unbond.vue
index 76c6b299..bf00902d 100644
--- a/src/views/components/OperationModal/components/Unbond.vue
+++ b/src/views/components/OperationModal/components/Unbond.vue
@@ -105,7 +105,6 @@ export default {
     vSelect,
     BInputGroupAppend,
     ValidationProvider,
-
   },
   props: {
     validatorAddress: {
@@ -123,7 +122,6 @@ export default {
       selectedValidator: this.validatorAddress,
       token: '',
       amount: null,
-      balance: [],
       delegations: [],
 
       required,
@@ -167,24 +165,16 @@ export default {
       modalTitle: 'Unbond Token',
       historyName: 'unbond',
     })
-    this.loadBalance()
+    this.loadData()
   },
 
   methods: {
-    printDenom() {
-      return formatTokenDenom(this.token)
-    },
-    loadBalance() {
+    loadData() {
       if (this.address) {
         this.$http.getValidatorList().then(v => {
           this.validators = v
         })
       }
-      this.$http.getBankBalances(this.address).then(res => {
-        if (res && res.length > 0) {
-          this.balance = res.reverse()
-        }
-      })
       this.$http.getStakingDelegations(this.address).then(res => {
         this.delegations = res.delegation_responses
         this.delegations.forEach(x => {
@@ -197,7 +187,9 @@ export default {
         })
       })
     },
-
+    printDenom() {
+      return formatTokenDenom(this.token)
+    },
   },
 }
 </script>
diff --git a/src/views/components/OperationModal/index.vue b/src/views/components/OperationModal/index.vue
index ccb50702..22d5ef1c 100644
--- a/src/views/components/OperationModal/index.vue
+++ b/src/views/components/OperationModal/index.vue
@@ -155,6 +155,7 @@ import Delegate from './components/Delegate.vue'
 import Redelegate from './components/Redelegate.vue'
 import Withdraw from './components/Withdraw.vue'
 import Unbond from './components/Unbond.vue'
+import Transfer from './components/Transfer.vue'
 
 export default {
   name: 'DelegateDialogue',
@@ -184,6 +185,7 @@ export default {
     Redelegate,
     Withdraw,
     Unbond,
+    Transfer,
   },
   directives: {
     Ripple,

From d5c0f266661936bcd70652cf56b99ba01c43dded Mon Sep 17 00:00:00 2001
From: donne1226 <503124742@qq.com>
Date: Thu, 31 Mar 2022 23:01:58 +0800
Subject: [PATCH 4/6] fix

---
 src/views/Governance.vue                      |  24 +-
 src/views/WalletAccountDetail.vue             |  15 +-
 .../OperationModal/components/IBCTransfer.vue | 308 ++++++++++++++++++
 .../OperationModal/components/Vote.vue        | 194 +++++++++++
 .../OperationModal/components/Withdraw.vue    |   1 -
 src/views/components/OperationModal/index.vue |  25 +-
 6 files changed, 559 insertions(+), 8 deletions(-)
 create mode 100644 src/views/components/OperationModal/components/IBCTransfer.vue
 create mode 100644 src/views/components/OperationModal/components/Vote.vue

diff --git a/src/views/Governance.vue b/src/views/Governance.vue
index 288a0d2d..7e7d3c25 100644
--- a/src/views/Governance.vue
+++ b/src/views/Governance.vue
@@ -160,7 +160,7 @@
               v-b-modal.deposit-window
               variant="primary"
               class="btn float-right mg-2"
-              @click="selectProposal(p.id, p.title)"
+              @click="selectProposal('GovDeposit',p.id, p.title)"
             >
               {{ $t('btn_deposit') }}
             </b-button>
@@ -169,10 +169,19 @@
               v-b-modal.vote-window
               variant="primary"
               class="btn float-right mg-2"
-              @click="selectProposal(p.id, p.title)"
+              @click="selectProposal('Vote',p.id, p.title)"
             >
               {{ $t('btn_vote') }}
             </b-button>
+            <b-button
+              v-if="p.status===2"
+              v-b-modal.operation-modal
+              variant="primary"
+              class="btn float-right mg-2"
+              @click="selectProposal('Vote',p.id, p.title)"
+            >
+              {{ $t('btn_vote') }}1
+            </b-button>
           </b-card-footer>
         </b-card>
       </b-col>
@@ -185,6 +194,11 @@
       :proposal-id="selectedProposalId"
       :title="selectedTitle"
     />
+    <operation-modal
+      :type="operationModalType"
+      :proposal-id="selectedProposalId"
+      :proposal-title="selectedTitle"
+    />
   </div>
 </template>
 
@@ -196,6 +210,7 @@ import Ripple from 'vue-ripple-directive'
 import { Proposal } from '@/libs/data'
 import { percent, tokenFormatter } from '@/libs/utils'
 import dayjs from 'dayjs'
+import OperationModal from '@/views/components/OperationModal/index.vue'
 import OperationVoteComponent from './OperationVoteComponent.vue'
 import OperationGovDepositComponent from './OperationGovDepositComponent.vue'
 
@@ -214,6 +229,7 @@ export default {
     BCol,
     OperationVoteComponent,
     OperationGovDepositComponent,
+    OperationModal,
   },
   directives: {
     'b-modal': VBModal,
@@ -225,6 +241,7 @@ export default {
       selectedTitle: '',
       proposals: [new Proposal()],
       max: 1,
+      operationModalType: '',
     }
   },
   mounted() {
@@ -234,7 +251,8 @@ export default {
     percent: v => percent(v),
     formatDate: v => dayjs(v).format('YYYY-MM-DD'),
     formatToken: v => tokenFormatter(v, {}),
-    selectProposal(pid, title) {
+    selectProposal(modal, pid, title) {
+      this.operationModalType = modal
       this.selectedProposalId = Number(pid)
       this.selectedTitle = title
     },
diff --git a/src/views/WalletAccountDetail.vue b/src/views/WalletAccountDetail.vue
index b0ad742f..321f4e24 100644
--- a/src/views/WalletAccountDetail.vue
+++ b/src/views/WalletAccountDetail.vue
@@ -69,8 +69,19 @@
              icon="SendIcon"
              class="d-md-none"
            />
-            <span class="d-none d-md-block">IBC Transfer
-            </span></b-button>
+            <span class="d-none d-md-block">IBC Transfer</span>
+          </b-button>
+          <b-button
+            v-b-modal.operation-modal
+            variant="danger"
+            size="sm"
+            @click="setOperationModalType('IBCTransfer')"
+          ><feather-icon
+             icon="SendIcon"
+             class="d-md-none"
+           />
+            <span class="d-none d-md-block">IBC Transfer1</span>
+          </b-button>
         </div>
       </b-card-header>
       <b-card-body class="pl-0 pr-0">
diff --git a/src/views/components/OperationModal/components/IBCTransfer.vue b/src/views/components/OperationModal/components/IBCTransfer.vue
new file mode 100644
index 00000000..2bdbe433
--- /dev/null
+++ b/src/views/components/OperationModal/components/IBCTransfer.vue
@@ -0,0 +1,308 @@
+<template>
+  <div>
+    <b-row>
+      <b-col>
+        <b-form-group
+          label="Sender"
+          label-for="Account"
+        >
+          <b-input-group class="mb-25">
+            <b-form-input
+              :value="address"
+              readonly
+            />
+          </b-input-group>
+        </b-form-group>
+      </b-col>
+    </b-row>
+    <b-row>
+      <b-col>
+        <b-form-group
+          label="Available Token"
+          label-for="Token"
+        >
+          <validation-provider
+            #default="{ errors }"
+            rules="required"
+            name="Token"
+          >
+            <b-form-select
+              v-model="token"
+              @change="tokenChange"
+            >
+              <template #first>
+                <b-form-select-option
+                  value=""
+                >
+                  -- Please select a token --
+                </b-form-select-option>
+              </template>
+              <b-form-select-option
+                v-for="item in balance"
+                :key="item.denom"
+                :value="item.denom"
+              >
+                {{ format(item) }}
+              </b-form-select-option>
+            </b-form-select>
+            <small class="text-danger">{{ errors[0] }}</small>
+          </validation-provider>
+        </b-form-group>
+      </b-col>
+    </b-row>
+    <b-row>
+      <b-col>
+        <b-form-group
+          label="Amount"
+          label-for="Amount"
+        >
+          <validation-provider
+            v-slot="{ errors }"
+            rules="required|regex:^([0-9\.]+)$"
+            name="amount"
+          >
+            <b-input-group class="mb-25">
+              <b-form-input
+                id="Amount"
+                v-model="amount"
+                :state="errors.length > 0 ? false:null"
+                placeholder="Input a number"
+                type="number"
+              />
+              <b-input-group-append is-text>
+                {{ printDenom() }}
+              </b-input-group-append>
+            </b-input-group>
+            <small class="text-danger">{{ errors[0] }}</small>
+          </validation-provider>
+        </b-form-group>
+      </b-col>
+    </b-row>
+    <b-row>
+      <b-col>
+        <b-form-group
+          :label="`Destination: ${targetChainId}`"
+          label-for="destination"
+        >
+          <validation-provider
+            #default="{ errors }"
+            rules="required"
+            name="destination"
+          >
+            <v-select
+              v-model="destination"
+              name="destination"
+              :options="destinationOptions"
+              placeholder="Select a channel"
+              @input="onChannelChange()"
+            />
+            <small class="text-danger">{{ errors[0] }}</small>
+          </validation-provider>
+        </b-form-group>
+      </b-col>
+    </b-row>
+    <b-row>
+      <b-col>
+        <b-form-group
+          label="Recipient"
+          label-for="Recipient"
+        >
+          <validation-provider
+            #default="{ errors }"
+            rules="required"
+            name="recipient"
+          >
+            <b-input-group class="mb-25">
+              <b-form-input
+                id="Recipient"
+                v-model="recipient"
+                :state="errors.length > 0 ? false:null"
+                placeholder="Input a destination address"
+              />
+            </b-input-group>
+            <small class="text-danger">{{ errors[0] }}</small>
+          </validation-provider>
+        </b-form-group>
+      </b-col>
+    </b-row>
+  </div>
+</template>
+
+<script>
+import { ValidationProvider } from 'vee-validate'
+import {
+  BRow, BCol, BInputGroup, BInputGroupAppend, BFormInput, BFormGroup, BFormSelect, BFormSelectOption,
+
+} from 'bootstrap-vue'
+import {
+  required, email, url, between, alpha, integer, password, min, digits, alphaDash, length,
+} from '@validations'
+import {
+  formatToken, formatTokenDenom, getUnitAmount,
+} from '@/libs/utils'
+import vSelect from 'vue-select'
+import { coin } from '@cosmjs/amino'
+import dayjs from 'dayjs'
+import { toHex } from '@cosmjs/encoding'
+import { sha256 } from '@cosmjs/crypto'
+
+export default {
+  name: 'TransforDialogue',
+  components: {
+    BRow,
+    BCol,
+    BInputGroup,
+    BInputGroupAppend,
+    BFormInput,
+    BFormGroup,
+    BFormSelect,
+    BFormSelectOption,
+    vSelect,
+
+    ValidationProvider,
+  },
+  props: {
+    address: {
+      type: String,
+      default: '',
+    },
+    balance: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      targetChainId: '',
+      token: '',
+      amount: null,
+      recipient: null,
+      error: null,
+      IBCDenom: {},
+      paths: {},
+      destination: {},
+      channels: [],
+
+      required,
+      password,
+      email,
+      min,
+      integer,
+      url,
+      alpha,
+      between,
+      digits,
+      length,
+      alphaDash,
+    }
+  },
+  computed: {
+    destinationOptions() {
+      if (!this.token && this.token === '') return []
+      const options = this.channels.map(x => ({ port_id: x.port_id, channel_id: x.channel_id, label: `${x.chain_id ? x.chain_id : ''} ${x.port_id}/${x.channel_id}` }))
+      if (this.token.startsWith('ibc/')) {
+        const query = this.paths[this.token]
+        return query ? options.filter(x => x.channel_id === query.channel_id) : options
+      }
+      return options
+    },
+
+    msg() {
+      const timeout = dayjs().add(4, 'hour')
+      return [
+        {
+          typeUrl: '/ibc.applications.transfer.v1.MsgTransfer',
+          value: {
+            sourcePort: this.destination.port_id,
+            sourceChannel: this.destination.channel_id,
+            token: coin(Number(getUnitAmount(this.amount, this.token)), this.token),
+            sender: this.address,
+            receiver: this.recipient,
+            timeoutTimestamp: String(timeout.utc().valueOf() * 1000000),
+          },
+        },
+      ]
+    },
+    balanceOptions() {
+      return this.setupBalance()
+    },
+    selectedChain() {
+      return this.$store.state.chains.selected
+    },
+  },
+  mounted() {
+    this.$emit('update', {
+      modalTitle: 'IBC Transfer Tokens',
+      historyName: 'transfer',
+    })
+    this.setActionName()
+    this.loadData()
+  },
+  methods: {
+    loadData() {
+      this.destination = null
+      this.channels = []
+      this.token = ''
+      this.targetChainId = ''
+      if (this.address) {
+        this.$http.getAllIBCDenoms(this.selectedChain).then(x => {
+          x.denom_traces.forEach(trace => {
+            const hash = toHex(sha256(new TextEncoder().encode(`${trace.path}/${trace.base_denom}`)))
+            const ibcDenom = `ibc/${hash.toUpperCase()}`
+            // add base_denom to cache
+            this.$set(this.IBCDenom, ibcDenom, trace.base_denom)
+            // store channel/part for ibc denoms
+            const path = trace.path.split('/')
+            if (path.length >= 2) {
+              this.paths[ibcDenom] = {
+                channel_id: path[path.length - 1],
+                port_id: path[path.length - 2],
+              }
+            }
+          })
+        })
+
+        this.$http.getIBCChannels(this.selectedChain, null).then(ret => {
+          const chans = ret.channels.filter(x => x.state === 'STATE_OPEN').map(x => ({ channel_id: x.channel_id, port_id: x.port_id }))
+          this.$set(this, 'channels', chans)
+        })
+      }
+    },
+    setupBalance() {
+      if (this.balance && this.balance.length > 0) {
+        this.token = this.balance[0].denom
+        return this.balance
+      }
+      return []
+    },
+    tokenChange() {
+      // eslint-disable-next-line prefer-destructuring
+      this.destination = this.destinationOptions[0]
+      this.recipient = null
+      this.setActionName()
+      this.onChannelChange()
+    },
+
+    setActionName() {
+      this.$emit('update', {
+        actionName: this.token.startsWith('ibc') ? 'Withdraw' : 'Deposit',
+      })
+    },
+
+    format(v) {
+      return formatToken(v, this.IBCDenom)
+    },
+    printDenom() {
+      return formatTokenDenom(this.IBCDenom[this.token] || this.token)
+    },
+    onChannelChange() {
+      this.$http.getIBCChannelClientState(this.destination.channel_id, this.destination.port_id, this.selectedChain).then(cs => {
+        this.targetChainId = cs.identified_client_state.client_state.chain_id
+      })
+    },
+  },
+}
+</script>
+<style lang="scss">
+@import '@core/scss/vue/libs/vue-select.scss';
+</style>
diff --git a/src/views/components/OperationModal/components/Vote.vue b/src/views/components/OperationModal/components/Vote.vue
new file mode 100644
index 00000000..2f45c0af
--- /dev/null
+++ b/src/views/components/OperationModal/components/Vote.vue
@@ -0,0 +1,194 @@
+<template>
+  <div>
+    <b-row>
+      <b-col>
+        <h4>{{ proposalId }}. {{ proposalTitle }}</h4>
+      </b-col>
+    </b-row>
+    <b-row>
+      <b-col>
+        <b-form-group
+          label="Voter"
+          label-for="Account"
+        >
+          <validation-provider
+            #default="{ errors }"
+            rules="required"
+            name="Voter"
+          >
+            <b-form-select
+              v-model="voter"
+              :options="accounts"
+              text-field="label"
+              placeholder="Select an address"
+              @change="onChange"
+            />
+            <small class="text-danger">{{ errors[0] }} <strong v-if="!accounts || accounts.length === 0">Please import an account first!</strong> </small>
+          </validation-provider>
+        </b-form-group>
+      </b-col>
+    </b-row>
+    <b-row>
+      <b-col>
+        <b-form-group
+          label="Option"
+          label-for="option"
+        >
+          <div class="demo-inline-spacing">
+
+            <b-form-radio
+              v-model="option"
+              name="option"
+              value="1"
+              class="custom-control-success"
+            >
+              Yes
+            </b-form-radio>
+            <b-form-radio
+              v-model="option"
+              name="option"
+              value="3"
+              class="custom-control-warning"
+            >
+              No
+            </b-form-radio>
+            <b-form-radio
+              v-model="option"
+              name="option"
+              value="4"
+              class="custom-control-danger"
+            >
+              No With Veto
+            </b-form-radio>
+            <b-form-radio
+              v-model="option"
+              name="option"
+              value="2"
+              class="custom-control-secondary"
+            >
+              Abstain
+            </b-form-radio>
+          </div>
+        </b-form-group>
+      </b-col>
+    </b-row>
+  </div>
+</template>
+
+<script>
+import { ValidationProvider } from 'vee-validate'
+import {
+  BRow, BCol, BFormGroup, BFormSelect,
+  BFormRadio,
+} from 'bootstrap-vue'
+import {
+  required, email, url, between, alpha, integer, password, min, digits, alphaDash, length,
+} from '@validations'
+import {
+  abbrAddress,
+  formatToken, getLocalAccounts,
+} from '@/libs/utils'
+
+export default {
+  name: 'VoteDialogue',
+  components: {
+    BRow,
+    BCol,
+    BFormGroup,
+    BFormSelect,
+    BFormRadio,
+    ValidationProvider,
+  },
+  props: {
+    proposalId: {
+      type: Number,
+      required: true,
+    },
+    proposalTitle: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      accounts: [],
+      voter: null,
+      option: null,
+      balance: [],
+      feeDenom: '',
+
+      required,
+      password,
+      email,
+      min,
+      integer,
+      url,
+      alpha,
+      between,
+      digits,
+      length,
+      alphaDash,
+    }
+  },
+  computed: {
+    msg() {
+      return [{
+        typeUrl: '/cosmos.gov.v1beta1.MsgVote',
+        value: {
+          voter: this.voter,
+          proposalId: this.proposalId,
+          option: Number(this.option),
+        },
+      }]
+    },
+  },
+  mounted() {
+    this.$emit('update', {
+      modalTitle: 'Vote',
+      historyName: 'vote',
+    })
+    this.loadData()
+  },
+  methods: {
+    computeAccount() {
+      let array = []
+      const accounts = getLocalAccounts()
+      if (accounts) {
+        const values = Object.values(accounts)
+        for (let i = 0; i < values.length; i += 1) {
+          const addrs = values[i].address.filter(x => x.chain === this.$route.params.chain)
+          if (addrs && addrs.length > 0) {
+            array = array.concat(addrs.map(x => ({ value: x.addr, label: values[i].name.concat(' - ', abbrAddress(x.addr)) })))
+          }
+        }
+      }
+      return array
+    },
+    onChange() {
+      if (this.voter) {
+        this.$http.getBankBalances(this.voter).then(res => {
+          if (res && res.length > 0) {
+            this.balance = res.reverse()
+            const token = this.balance.find(i => !i.denom.startsWith('ibc'))
+            if (token) this.feeDenom = token.denom
+          }
+        })
+      }
+    },
+    loadData() {
+      this.accounts = this.computeAccount()
+      // eslint-disable-next-line prefer-destructuring
+      if (this.accounts && this.accounts.length > 0) this.voter = this.accounts[0].value
+      this.onChange()
+    },
+    format(v) {
+      return formatToken(v)
+    },
+
+  },
+}
+</script>
+
+<style lang="scss">
+@import '@core/scss/vue/libs/vue-select.scss';
+</style>
diff --git a/src/views/components/OperationModal/components/Withdraw.vue b/src/views/components/OperationModal/components/Withdraw.vue
index 666d3bea..5fd99991 100644
--- a/src/views/components/OperationModal/components/Withdraw.vue
+++ b/src/views/components/OperationModal/components/Withdraw.vue
@@ -44,7 +44,6 @@ export default {
   data() {
     return {
       account: [],
-      selectedChain: '',
       balance: [],
       delegations: [],
       feeDenom: '',
diff --git a/src/views/components/OperationModal/index.vue b/src/views/components/OperationModal/index.vue
index 22d5ef1c..ef276136 100644
--- a/src/views/components/OperationModal/index.vue
+++ b/src/views/components/OperationModal/index.vue
@@ -4,7 +4,7 @@
     centered
     size="md"
     :title="modalTitle"
-    ok-title="Send"
+    :ok-title="actionName"
     hide-header-close
     scrollable
     :ok-disabled="isOwner"
@@ -43,6 +43,8 @@
             :address="address"
             :validator-address="validatorAddress"
             :balance="balance"
+            :proposal-id="proposalId"
+            :proposal-title="proposalTitle"
             @update="componentUpdate"
           />
           <b-row>
@@ -156,6 +158,8 @@ import Redelegate from './components/Redelegate.vue'
 import Withdraw from './components/Withdraw.vue'
 import Unbond from './components/Unbond.vue'
 import Transfer from './components/Transfer.vue'
+import IBCTransfer from './components/IBCTransfer.vue'
+import Vote from './components/Vote.vue'
 
 export default {
   name: 'DelegateDialogue',
@@ -186,6 +190,8 @@ export default {
     Withdraw,
     Unbond,
     Transfer,
+    IBCTransfer,
+    Vote,
   },
   directives: {
     Ripple,
@@ -203,6 +209,14 @@ export default {
       type: String,
       default: null,
     },
+    proposalId: {
+      type: Number,
+      default: null,
+    },
+    proposalTitle: {
+      type: String,
+      default: null,
+    },
   },
   data() {
     return {
@@ -225,6 +239,7 @@ export default {
       gas: '200000',
       memo: '',
       blockingMsg: 'No available account found.',
+      actionName: 'Send',
 
       required,
       password,
@@ -247,8 +262,14 @@ export default {
     isOwner() {
       const accounts = getLocalAccounts()
       const selectedWallet = this.$store.state.chains.defaultWallet
+      if (!this.address) {
+        const chain = this.$store.state.chains.selected.chain_name
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        this.selectedAddress = accounts[selectedWallet].address.find(x => x.chain === chain)
+      }
+
       if (accounts && accounts[selectedWallet]) {
-        if (accounts[selectedWallet].address.findIndex(x => x.addr === this.address) > -1) {
+        if (accounts[selectedWallet].address.findIndex(x => x.addr === this.selectedAddress) > -1) {
           return false
         }
       }

From ae9bf25abf2a9abd73a77b67d0c9672eb82c66ec Mon Sep 17 00:00:00 2001
From: liangping <18786721@qq.com>
Date: Thu, 31 Mar 2022 23:39:47 +0800
Subject: [PATCH 5/6] select the default address

---
 src/views/components/OperationModal/index.vue | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/views/components/OperationModal/index.vue b/src/views/components/OperationModal/index.vue
index ef276136..af0b1af0 100644
--- a/src/views/components/OperationModal/index.vue
+++ b/src/views/components/OperationModal/index.vue
@@ -222,7 +222,6 @@ export default {
     return {
       modalTitle: '',
       historyName: '',
-      selectedAddress: this.address,
       selectedValidator: null,
       selectedChain: null,
       token: '',
@@ -238,7 +237,7 @@ export default {
       wallet: 'ledgerUSB',
       gas: '200000',
       memo: '',
-      blockingMsg: 'No available account found.',
+      blockingMsg: this.address ? 'You are not the owner' : 'No available account found.',
       actionName: 'Send',
 
       required,
@@ -259,22 +258,27 @@ export default {
       if (!this.balance) return []
       return this.balance.filter(item => !item.denom.startsWith('ibc'))
     },
-    isOwner() {
+    accounts() {
       const accounts = getLocalAccounts()
       const selectedWallet = this.$store.state.chains.defaultWallet
-      if (!this.address) {
-        const chain = this.$store.state.chains.selected.chain_name
-        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-        this.selectedAddress = accounts[selectedWallet].address.find(x => x.chain === chain)
-      }
-
-      if (accounts && accounts[selectedWallet]) {
-        if (accounts[selectedWallet].address.findIndex(x => x.addr === this.selectedAddress) > -1) {
+      return accounts[selectedWallet]
+    },
+    isOwner() {
+      if (this.accounts) {
+        if (this.accounts.address.findIndex(x => x.addr === this.selectedAddress) > -1) {
           return false
         }
       }
       return true
     },
+    selectedAddress() {
+      if (this.address) {
+        return this.address
+      }
+      const chain = this.$store.state.chains.selected.chain_name
+      const selectedAddress = this.accounts.address.find(x => x.chain === chain)
+      return selectedAddress?.addr
+    },
   },
   methods: {
     initialize() {

From 7c93f6f7c794f55304efd3b93a1aae8c4f5724b6 Mon Sep 17 00:00:00 2001
From: donne1226 <503124742@qq.com>
Date: Fri, 1 Apr 2022 23:28:42 +0800
Subject: [PATCH 6/6] fix all

---
 src/views/Governance.vue                      |   9 +
 src/views/StakingRewardComponent.vue          |  17 +-
 .../OperationModal/components/GovDeposit.vue  | 194 ++++++++++++++++++
 .../OperationModal/components/IBCTransfer.vue |   1 -
 .../OperationModal/components/Unbond.vue      |   1 -
 .../OperationModal/components/Vote.vue        | 136 +++++-------
 .../OperationModal/components/Withdraw.vue    |  16 --
 .../components/WithdrawCommission.vue         |  84 ++++++++
 src/views/components/OperationModal/index.vue |   6 +-
 9 files changed, 362 insertions(+), 102 deletions(-)
 create mode 100644 src/views/components/OperationModal/components/GovDeposit.vue
 create mode 100644 src/views/components/OperationModal/components/WithdrawCommission.vue

diff --git a/src/views/Governance.vue b/src/views/Governance.vue
index 7e7d3c25..b51d339f 100644
--- a/src/views/Governance.vue
+++ b/src/views/Governance.vue
@@ -164,6 +164,15 @@
             >
               {{ $t('btn_deposit') }}
             </b-button>
+            <b-button
+              v-if="p.status===1"
+              v-b-modal.operation-modal
+              variant="primary"
+              class="btn float-right mg-2"
+              @click="selectProposal('GovDeposit',p.id, p.title)"
+            >
+              {{ $t('btn_deposit') }}1
+            </b-button>
             <b-button
               v-if="p.status===2"
               v-b-modal.vote-window
diff --git a/src/views/StakingRewardComponent.vue b/src/views/StakingRewardComponent.vue
index 6ac11107..2dbdea30 100644
--- a/src/views/StakingRewardComponent.vue
+++ b/src/views/StakingRewardComponent.vue
@@ -6,7 +6,7 @@
     <b-card-header>
       <b-card-title>Outstanding Rewards</b-card-title>
       <feather-icon
-        v-b-modal.withdraw-commission-window
+        v-b-modal.operation-modal
         icon="MoreVerticalIcon"
         size="18"
         class="cursor-pointer"
@@ -83,11 +83,24 @@
       >
         Withdraw Commission
       </b-button>
+      <b-button
+        v-b-modal.operation-modal
+        block
+        size="sm"
+        variant="primary"
+      >
+        Withdraw Commission1
+      </b-button>
     </b-card-body>
     <operation-withdraw-commission-component
       :validator-address="validator"
       :address="address"
     />
+    <operation-modal
+      type="WithdrawCommission"
+      :address="address"
+      :validator-address="validator"
+    />
   </b-card>
 </template>
 
@@ -98,6 +111,7 @@ import {
 import { sha256 } from '@cosmjs/crypto'
 import { toHex } from '@cosmjs/encoding'
 import { formatToken, numberWithCommas } from '@/libs/utils'
+import OperationModal from '@/views/components/OperationModal/index.vue'
 import OperationWithdrawCommissionComponent from './OperationWithdrawCommissionComponent.vue'
 
 export default {
@@ -112,6 +126,7 @@ export default {
     BMediaAside,
     BAvatar,
     OperationWithdrawCommissionComponent,
+    OperationModal,
   },
   props: {
     data: {
diff --git a/src/views/components/OperationModal/components/GovDeposit.vue b/src/views/components/OperationModal/components/GovDeposit.vue
new file mode 100644
index 00000000..8bdf23eb
--- /dev/null
+++ b/src/views/components/OperationModal/components/GovDeposit.vue
@@ -0,0 +1,194 @@
+<template>
+  <div>
+    <b-row>
+      <b-col>
+        <h4>{{ proposalId }}. {{ proposalTitle }}</h4>
+      </b-col>
+    </b-row>
+    <b-row>
+      <b-col>
+        <b-form-group
+          label="Depositor"
+          label-for="Voter"
+        >
+          <validation-provider
+            #default="{ errors }"
+            rules="required"
+            name="Voter"
+          >
+            <b-form-input
+              v-model="address"
+              readonly
+            />
+            <small class="text-danger">{{ errors[0] }}</small>
+          </validation-provider>
+        </b-form-group>
+      </b-col>
+    </b-row>
+    <b-row>
+      <b-col>
+        <b-form-group
+          label="Available Token"
+          label-for="Token"
+        >
+          <validation-provider
+            #default="{ errors }"
+            rules="required"
+            name="Token"
+          >
+            <b-form-select
+              v-model="token"
+            >
+              <b-form-select-option
+                v-for="item in balanceOptions"
+                :key="item.denom"
+                :value="item.denom"
+              >
+                {{ format(item) }}
+              </b-form-select-option>
+            </b-form-select>
+            <small class="text-danger">{{ errors[0] }}</small>
+          </validation-provider>
+        </b-form-group>
+      </b-col>
+    </b-row>
+    <b-row>
+      <b-col>
+        <b-form-group
+          label="Amount"
+          label-for="Amount"
+        >
+          <validation-provider
+            v-slot="{ errors }"
+            rules="required|regex:^([0-9\.]+)$"
+            name="amount"
+          >
+            <b-input-group class="mb-25">
+              <b-form-input
+                id="Amount"
+                v-model="amount"
+                :state="errors.length > 0 ? false:null"
+                placeholder="Input a number"
+                type="number"
+              />
+              <b-input-group-append is-text>
+                {{ printDenom() }}
+              </b-input-group-append>
+            </b-input-group>
+            <small class="text-danger">{{ errors[0] }}</small>
+          </validation-provider>
+        </b-form-group>
+      </b-col>
+    </b-row>
+  </div>
+</template>
+
+<script>
+import { ValidationProvider } from 'vee-validate'
+import {
+  BRow, BCol, BInputGroup, BFormInput, BFormGroup, BFormSelect,
+  BInputGroupAppend, BFormSelectOption,
+} from 'bootstrap-vue'
+import {
+  required, email, url, between, alpha, integer, password, min, digits, alphaDash, length,
+} from '@validations'
+import {
+  formatToken, formatTokenDenom, getUnitAmount,
+} from '@/libs/utils'
+
+export default {
+  name: 'DepositDialogue',
+  components: {
+    BRow,
+    BCol,
+    BInputGroup,
+    BFormInput,
+    BFormGroup,
+    BFormSelect,
+    BInputGroupAppend,
+    BFormSelectOption,
+    ValidationProvider,
+  },
+  props: {
+    proposalId: {
+      type: Number,
+      required: true,
+    },
+    proposalTitle: {
+      type: String,
+      required: true,
+    },
+    balance: {
+      type: Array,
+      default: () => [],
+    },
+    address: {
+      type: String,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      token: null,
+      amount: '',
+
+      required,
+      password,
+      email,
+      min,
+      integer,
+      url,
+      alpha,
+      between,
+      digits,
+      length,
+      alphaDash,
+    }
+  },
+  computed: {
+    msg() {
+      return [{
+        typeUrl: '/cosmos.gov.v1beta1.MsgDeposit',
+        value: {
+          depositor: this.address,
+          proposalId: String(this.proposalId),
+          amount: [
+            {
+              amount: getUnitAmount(this.amount, this.token),
+              denom: this.token,
+            },
+          ],
+        },
+      }]
+    },
+    balanceOptions() {
+      return this.setupBalance()
+    },
+  },
+  mounted() {
+    this.$emit('update', {
+      modalTitle: 'Deposit',
+      historyName: 'deposit',
+    })
+  },
+  methods: {
+    printDenom() {
+      return formatTokenDenom(this.token)
+    },
+    format(v) {
+      return formatToken(v)
+    },
+    setupBalance() {
+      if (this.balance && this.balance.length > 0) {
+        this.token = this.balance[0].denom
+        return this.balance
+      }
+      return []
+    },
+  },
+}
+</script>
+
+<style lang="scss">
+@import '@core/scss/vue/libs/vue-select.scss';
+</style>
diff --git a/src/views/components/OperationModal/components/IBCTransfer.vue b/src/views/components/OperationModal/components/IBCTransfer.vue
index 2bdbe433..99b5d4ea 100644
--- a/src/views/components/OperationModal/components/IBCTransfer.vue
+++ b/src/views/components/OperationModal/components/IBCTransfer.vue
@@ -177,7 +177,6 @@ export default {
       token: '',
       amount: null,
       recipient: null,
-      error: null,
       IBCDenom: {},
       paths: {},
       destination: {},
diff --git a/src/views/components/OperationModal/components/Unbond.vue b/src/views/components/OperationModal/components/Unbond.vue
index bf00902d..2882a100 100644
--- a/src/views/components/OperationModal/components/Unbond.vue
+++ b/src/views/components/OperationModal/components/Unbond.vue
@@ -119,7 +119,6 @@ export default {
   data() {
     return {
       validators: [],
-      selectedValidator: this.validatorAddress,
       token: '',
       amount: null,
       delegations: [],
diff --git a/src/views/components/OperationModal/components/Vote.vue b/src/views/components/OperationModal/components/Vote.vue
index 2f45c0af..f25e0029 100644
--- a/src/views/components/OperationModal/components/Vote.vue
+++ b/src/views/components/OperationModal/components/Vote.vue
@@ -16,14 +16,11 @@
             rules="required"
             name="Voter"
           >
-            <b-form-select
-              v-model="voter"
-              :options="accounts"
-              text-field="label"
-              placeholder="Select an address"
-              @change="onChange"
+            <b-form-input
+              v-model="address"
+              readonly
             />
-            <small class="text-danger">{{ errors[0] }} <strong v-if="!accounts || accounts.length === 0">Please import an account first!</strong> </small>
+            <small class="text-danger">{{ errors[0] }}</small>
           </validation-provider>
         </b-form-group>
       </b-col>
@@ -34,41 +31,48 @@
           label="Option"
           label-for="option"
         >
-          <div class="demo-inline-spacing">
+          <validation-provider
+            #default="{ errors }"
+            rules="required"
+            name="option"
+          >
+            <div class="demo-inline-spacing">
 
-            <b-form-radio
-              v-model="option"
-              name="option"
-              value="1"
-              class="custom-control-success"
-            >
-              Yes
-            </b-form-radio>
-            <b-form-radio
-              v-model="option"
-              name="option"
-              value="3"
-              class="custom-control-warning"
-            >
-              No
-            </b-form-radio>
-            <b-form-radio
-              v-model="option"
-              name="option"
-              value="4"
-              class="custom-control-danger"
-            >
-              No With Veto
-            </b-form-radio>
-            <b-form-radio
-              v-model="option"
-              name="option"
-              value="2"
-              class="custom-control-secondary"
-            >
-              Abstain
-            </b-form-radio>
-          </div>
+              <b-form-radio
+                v-model="option"
+                name="option"
+                value="1"
+                class="custom-control-success"
+              >
+                Yes
+              </b-form-radio>
+              <b-form-radio
+                v-model="option"
+                name="option"
+                value="3"
+                class="custom-control-warning"
+              >
+                No
+              </b-form-radio>
+              <b-form-radio
+                v-model="option"
+                name="option"
+                value="4"
+                class="custom-control-danger"
+              >
+                No With Veto
+              </b-form-radio>
+              <b-form-radio
+                v-model="option"
+                name="option"
+                value="2"
+                class="custom-control-secondary"
+              >
+                Abstain
+              </b-form-radio>
+            </div>
+            <small class="text-danger">{{ errors[0] }}</small>
+          </validation-provider>
         </b-form-group>
       </b-col>
     </b-row>
@@ -78,15 +82,14 @@
 <script>
 import { ValidationProvider } from 'vee-validate'
 import {
-  BRow, BCol, BFormGroup, BFormSelect,
+  BRow, BCol, BFormGroup, BFormInput,
   BFormRadio,
 } from 'bootstrap-vue'
 import {
   required, email, url, between, alpha, integer, password, min, digits, alphaDash, length,
 } from '@validations'
 import {
-  abbrAddress,
-  formatToken, getLocalAccounts,
+  formatToken,
 } from '@/libs/utils'
 
 export default {
@@ -95,9 +98,9 @@ export default {
     BRow,
     BCol,
     BFormGroup,
-    BFormSelect,
     BFormRadio,
     ValidationProvider,
+    BFormInput,
   },
   props: {
     proposalId: {
@@ -108,14 +111,14 @@ export default {
       type: String,
       required: true,
     },
+    address: {
+      type: String,
+      default: null,
+    },
   },
   data() {
     return {
-      accounts: [],
-      voter: null,
       option: null,
-      balance: [],
-      feeDenom: '',
 
       required,
       password,
@@ -135,7 +138,7 @@ export default {
       return [{
         typeUrl: '/cosmos.gov.v1beta1.MsgVote',
         value: {
-          voter: this.voter,
+          voter: this.address,
           proposalId: this.proposalId,
           option: Number(this.option),
         },
@@ -147,40 +150,9 @@ export default {
       modalTitle: 'Vote',
       historyName: 'vote',
     })
-    this.loadData()
   },
   methods: {
-    computeAccount() {
-      let array = []
-      const accounts = getLocalAccounts()
-      if (accounts) {
-        const values = Object.values(accounts)
-        for (let i = 0; i < values.length; i += 1) {
-          const addrs = values[i].address.filter(x => x.chain === this.$route.params.chain)
-          if (addrs && addrs.length > 0) {
-            array = array.concat(addrs.map(x => ({ value: x.addr, label: values[i].name.concat(' - ', abbrAddress(x.addr)) })))
-          }
-        }
-      }
-      return array
-    },
-    onChange() {
-      if (this.voter) {
-        this.$http.getBankBalances(this.voter).then(res => {
-          if (res && res.length > 0) {
-            this.balance = res.reverse()
-            const token = this.balance.find(i => !i.denom.startsWith('ibc'))
-            if (token) this.feeDenom = token.denom
-          }
-        })
-      }
-    },
-    loadData() {
-      this.accounts = this.computeAccount()
-      // eslint-disable-next-line prefer-destructuring
-      if (this.accounts && this.accounts.length > 0) this.voter = this.accounts[0].value
-      this.onChange()
-    },
+
     format(v) {
       return formatToken(v)
     },
diff --git a/src/views/components/OperationModal/components/Withdraw.vue b/src/views/components/OperationModal/components/Withdraw.vue
index 5fd99991..331748c5 100644
--- a/src/views/components/OperationModal/components/Withdraw.vue
+++ b/src/views/components/OperationModal/components/Withdraw.vue
@@ -22,9 +22,6 @@
 import {
   BRow, BCol, BInputGroup, BFormInput, BFormGroup,
 } from 'bootstrap-vue'
-import {
-  required, email, url, between, alpha, integer, password, min, digits, alphaDash, length,
-} from '@validations'
 
 export default {
   name: 'WithdrawDialogue',
@@ -47,18 +44,6 @@ export default {
       balance: [],
       delegations: [],
       feeDenom: '',
-
-      required,
-      password,
-      email,
-      min,
-      integer,
-      url,
-      alpha,
-      between,
-      digits,
-      length,
-      alphaDash,
     }
   },
   computed: {
@@ -87,7 +72,6 @@ export default {
   methods: {
     loadData() {
       this.$http.getStakingDelegations(this.address).then(res => {
-        console.log(res)
         this.delegations = res.delegation_responses
       })
     },
diff --git a/src/views/components/OperationModal/components/WithdrawCommission.vue b/src/views/components/OperationModal/components/WithdrawCommission.vue
new file mode 100644
index 00000000..487a8a65
--- /dev/null
+++ b/src/views/components/OperationModal/components/WithdrawCommission.vue
@@ -0,0 +1,84 @@
+<template>
+  <div>
+    <b-row>
+      <b-col>
+        <b-form-group
+          label="Sender"
+          label-for="Account"
+        >
+          <b-input-group class="mb-25">
+            <b-form-input
+              :value="address"
+              readonly
+            />
+          </b-input-group>
+        </b-form-group>
+      </b-col>
+    </b-row>
+  </div>
+</template>
+
+<script>
+import {
+  BRow,
+  BCol,
+  BInputGroup,
+  BFormInput,
+  BFormGroup,
+} from 'bootstrap-vue'
+
+export default {
+  name: 'WithdrawCommissionDialogue',
+  components: {
+    BRow,
+    BCol,
+    BInputGroup,
+    BFormInput,
+    BFormGroup,
+
+  },
+  props: {
+    address: {
+      type: String,
+      default: '',
+    },
+    validatorAddress: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+
+    }
+  },
+  computed: {
+    msg() {
+      return [
+        {
+          typeUrl: '/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward',
+          value: {
+            delegatorAddress: this.address,
+            validatorAddress: this.validatorAddress,
+          },
+        },
+        {
+          typeUrl: '/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission',
+          value: {
+            validatorAddress: this.validatorAddress,
+          },
+        },
+      ]
+    },
+  },
+  mounted() {
+    this.$emit('update', {
+      modalTitle: 'Withdraw Validator Commission',
+      historyName: 'withdraw',
+    })
+  },
+  methods: {
+
+  },
+}
+</script>
diff --git a/src/views/components/OperationModal/index.vue b/src/views/components/OperationModal/index.vue
index af0b1af0..d1a28649 100644
--- a/src/views/components/OperationModal/index.vue
+++ b/src/views/components/OperationModal/index.vue
@@ -40,7 +40,7 @@
           <component
             :is="type"
             ref="component"
-            :address="address"
+            :address="selectedAddress"
             :validator-address="validatorAddress"
             :balance="balance"
             :proposal-id="proposalId"
@@ -160,6 +160,8 @@ import Unbond from './components/Unbond.vue'
 import Transfer from './components/Transfer.vue'
 import IBCTransfer from './components/IBCTransfer.vue'
 import Vote from './components/Vote.vue'
+import WithdrawCommission from './components/WithdrawCommission.vue'
+import GovDeposit from './components/GovDeposit.vue'
 
 export default {
   name: 'DelegateDialogue',
@@ -192,6 +194,8 @@ export default {
     Transfer,
     IBCTransfer,
     Vote,
+    WithdrawCommission,
+    GovDeposit,
   },
   directives: {
     Ripple,