update tx boxes

This commit is contained in:
liangping 2022-04-04 16:59:23 +08:00
parent 0993394e1c
commit 4864ccf37f
6 changed files with 108 additions and 159 deletions

View File

@ -157,40 +157,22 @@
</router-link> </router-link>
<b-button <b-button
v-if="p.status===1" v-if="p.status===1"
v-b-modal.deposit-window v-b-modal.operation-modal
variant="primary" variant="primary"
class="btn float-right mg-2" class="btn float-right mg-2"
@click="selectProposal('GovDeposit',p.id, p.title)" @click="selectProposal('GovDeposit',p.id, p.title)"
> >
{{ $t('btn_deposit') }} {{ $t('btn_deposit') }}
</b-button> </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 <b-button
v-if="p.status===2" v-if="p.status===2"
v-b-modal.vote-window v-b-modal.operation-modal
variant="primary" variant="primary"
class="btn float-right mg-2" class="btn float-right mg-2"
@click="selectProposal('Vote',p.id, p.title)" @click="selectProposal('Vote',p.id, p.title)"
> >
{{ $t('btn_vote') }} {{ $t('btn_vote') }}
</b-button> </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-footer>
</b-card> </b-card>
</b-col> </b-col>

View File

@ -246,23 +246,6 @@ export default {
}, },
data() { data() {
return { return {
keys: [
'bitsongvaloper1jxv0u20scum4trha72c7ltfgfqef6nscl86wxa',
'akashvaloper1vgstlgtsx4w80gphwgre0fcvc04lcnaelukvll',
'certikvaloper1jxv0u20scum4trha72c7ltfgfqef6nsczkvcu7',
'cosmosvaloper1jxv0u20scum4trha72c7ltfgfqef6nsch7q6cu',
'iva16plp8cmfkjssp222taq6pv6mkm8c5pa9lcktta',
'junovaloper1jxv0u20scum4trha72c7ltfgfqef6nscm9pmg2',
'kavavaloper1xftqdxvq0xkv2mu8c5y0jrsc578tak4m9u0s44',
'kivaloper1jxv0u20scum4trha72c7ltfgfqef6nschqtan9',
'osmovaloper1jxv0u20scum4trha72c7ltfgfqef6nscqx0u46',
'persistencevaloper1jxv0u20scum4trha72c7ltfgfqef6nsc4zjpnj',
'starsvaloper1jxv0u20scum4trha72c7ltfgfqef6nscdghxyx',
'digvaloper1jxv0u20scum4trha72c7ltfgfqef6nsc4s577p',
'bcnavaloper1jxv0u20scum4trha72c7ltfgfqef6nsc384wxf',
'pbvaloper1jxv0u20scum4trha72c7ltfgfqef6nsc5nn6cf',
'rizonvaloper1jxv0u20scum4trha72c7ltfgfqef6nsczn2l68',
],
islive: true, islive: true,
validator_address: null, validator_address: null,
mintInflation: 0, mintInflation: 0,
@ -313,7 +296,7 @@ export default {
}, },
computed: { computed: {
pingVals() { pingVals() {
return this.list.filter(x => this.keys.includes(x.operator_address)) return this.list.filter(x => x.description.identity === '6783E9F948541962')
}, },
list() { list() {
return this.validators.map(x => { return this.validators.map(x => {

View File

@ -75,21 +75,13 @@
</div> </div>
</b-card-body> </b-card-body>
<b-card-body class="pt-0"> <b-card-body class="pt-0">
<b-button
v-b-modal.withdraw-commission-window
block
size="sm"
variant="primary"
>
Withdraw Commission
</b-button>
<b-button <b-button
v-b-modal.operation-modal v-b-modal.operation-modal
block block
size="sm" size="sm"
variant="primary" variant="primary"
> >
Withdraw Commission1 Withdraw Commission
</b-button> </b-button>
</b-card-body> </b-card-body>
<operation-withdraw-commission-component <operation-withdraw-commission-component

View File

@ -38,17 +38,6 @@
<b-card-header class="pt-0 pl-0 pr-0"> <b-card-header class="pt-0 pl-0 pr-0">
<b-card-title>Assets</b-card-title> <b-card-title>Assets</b-card-title>
<div> <div>
<b-button
v-b-modal.transfer-window
variant="primary"
size="sm"
class="mr-25"
><feather-icon
icon="SendIcon"
class="d-md-none"
/>
<span class="d-none d-md-block">Transfer</span>
</b-button>
<b-button <b-button
v-b-modal.operation-modal v-b-modal.operation-modal
variant="primary" variant="primary"
@ -59,17 +48,7 @@
<feather-icon <feather-icon
icon="SendIcon" icon="SendIcon"
class="d-md-none" class="d-md-none"
/><small class="d-none d-md-block">Transfer1</small> /><small class="d-none d-md-block">Transfer</small>
</b-button>
<b-button
v-b-modal.ibc-transfer-window
variant="danger"
size="sm"
><feather-icon
icon="SendIcon"
class="d-md-none"
/>
<span class="d-none d-md-block">IBC Transfer</span>
</b-button> </b-button>
<b-button <b-button
v-b-modal.operation-modal v-b-modal.operation-modal
@ -80,7 +59,7 @@
icon="SendIcon" icon="SendIcon"
class="d-md-none" class="d-md-none"
/> />
<span class="d-none d-md-block">IBC Transfer1</span> <span class="d-none d-md-block">IBC Transfer</span>
</b-button> </b-button>
</div> </div>
</b-card-header> </b-card-header>
@ -152,34 +131,12 @@
size="sm" size="sm"
class="mr-25" class="mr-25"
@click="setOperationModalType('Delegate')" @click="setOperationModalType('Delegate')"
>
<feather-icon
icon="LogInIcon"
class="d-md-none"
/><small class="d-none d-md-block">Delegate1</small>
</b-button>
<b-button
v-b-modal.delegate-window
variant="primary"
size="sm"
class="mr-25"
> >
<feather-icon <feather-icon
icon="LogInIcon" icon="LogInIcon"
class="d-md-none" class="d-md-none"
/><small class="d-none d-md-block">Delegate</small> /><small class="d-none d-md-block">Delegate</small>
</b-button> </b-button>
<b-button
v-if="delegations"
v-b-modal.withdraw-window
variant="primary"
size="sm"
>
<feather-icon
icon="ShareIcon"
class="d-md-none"
/><small class="d-none d-md-block"> Withdraw Rewards</small>
</b-button>
<b-button <b-button
v-if="delegations" v-if="delegations"
v-b-modal.operation-modal v-b-modal.operation-modal
@ -190,7 +147,7 @@
<feather-icon <feather-icon
icon="ShareIcon" icon="ShareIcon"
class="d-md-none" class="d-md-none"
/><small class="d-none d-md-block"> Withdraw Rewards1</small> /><small class="d-none d-md-block"> Withdraw Rewards</small>
</b-button> </b-button>
</div> </div>
</b-card-header> </b-card-header>
@ -205,45 +162,27 @@
size="sm" size="sm"
> >
<b-button <b-button
v-b-modal.delegate-window v-b-modal.operation-modal
v-ripple.400="'rgba(113, 102, 240, 0.15)'" v-ripple.400="'rgba(113, 102, 240, 0.15)'"
v-b-tooltip.hover.top="'Delegate'" v-b-tooltip.hover.top="'Delegate'"
variant="outline-primary" variant="outline-primary"
@click="selectValue(data.value)" @click="selectValue(data.value,'Delegate')"
> >
<feather-icon icon="LogInIcon" /> <feather-icon icon="LogInIcon" />
</b-button> </b-button>
<b-button
v-b-modal.redelegate-window
v-ripple.400="'rgba(113, 102, 240, 0.15)'"
v-b-tooltip.hover.top="'Redelegate'"
variant="outline-primary"
@click="selectValue(data.value)"
>
<feather-icon icon="ShuffleIcon" />
</b-button>
<b-button <b-button
v-b-modal.operation-modal v-b-modal.operation-modal
v-ripple.400="'rgba(113, 102, 240, 0.15)'" v-ripple.400="'rgba(113, 102, 240, 0.15)'"
v-b-tooltip.hover.top="'Redelegate1'" v-b-tooltip.hover.top="'Redelegate'"
variant="outline-primary" variant="outline-primary"
@click="selectValue(data.value,'Redelegate')" @click="selectValue(data.value,'Redelegate')"
> >
<feather-icon icon="ShuffleIcon" /> <feather-icon icon="ShuffleIcon" />
</b-button> </b-button>
<b-button
v-b-modal.unbond-window
v-ripple.400="'rgba(113, 102, 240, 0.15)'"
v-b-tooltip.hover.top="'Unbond'"
variant="outline-primary"
@click="selectValue(data.value)"
>
<feather-icon icon="LogOutIcon" />
</b-button>
<b-button <b-button
v-b-modal.operation-modal v-b-modal.operation-modal
v-ripple.400="'rgba(113, 102, 240, 0.15)'" v-ripple.400="'rgba(113, 102, 240, 0.15)'"
v-b-tooltip.hover.top="'Unbond1'" v-b-tooltip.hover.top="'Unbond'"
variant="outline-primary" variant="outline-primary"
@click="selectValue(data.value,'Unbond')" @click="selectValue(data.value,'Unbond')"
> >

View File

@ -1,10 +1,10 @@
<template> <template>
<div> <div>
<div class="board">
<div <div
v-if="1" v-if="false"
class="data" class="board "
> >
<div class="data">
<div class="board-row"> <div class="board-row">
<div class="key"> <div class="key">
AMOUNT AMOUNT
@ -33,11 +33,23 @@
</div> </div>
<p <p
v-if="1" v-if="succeed"
class="result-text" class="result-text mt-1 text-success"
> >
Congratulations! Transfer completed successfully. Congratulations! Transfer completed successfully.
</p> </p>
<p
v-else-if="error"
class="result-text mt-1 text-danger"
>
{{ error }}
</p>
<p
v-else
class="result-text mt-1 text-primary"
>
Processing...
</p>
<div class="status"> <div class="status">
<!-- <b-progress <!-- <b-progress
@ -60,15 +72,16 @@
/> />
</b-progress> </b-progress>
<div class="status-text"> <div class="status-text">
<span>SUBMITED</span> <span v-if="hash">SUBMITED</span>
<span>COMPLETED</span> <span v-if="succeed">COMPLETED</span>
<span v-if="error">FAILED</span>
</div> </div>
</div> </div>
<div class="link"> <div class="link">
<router-link <router-link
to="/" to="/"
> >
View on explorer View details
</router-link> </router-link>
</div> </div>
</div> </div>
@ -82,9 +95,17 @@ export default {
BProgress, BProgress,
BProgressBar, BProgressBar,
}, },
props: {
hash: {
type: String,
default: null,
},
},
data() { data() {
return { return {
isLoading: true, isLoading: true,
succeed: false,
error: '',
} }
}, },
computed: { computed: {
@ -92,7 +113,40 @@ export default {
// success: [100, 0, 0] // success: [100, 0, 0]
// fail: [50, 50, 0] // fail: [50, 50, 0]
// pending: [0, 0, 100] // pending: [0, 0, 100]
if (!this.hash) {
return [0, 0, 100] return [0, 0, 100]
}
if (this.succeed) {
return [100, 0, 0]
}
return [50, 0, 50]
},
},
mounted() {
this.timer = setInterval(this.trace, 6000)
},
beforeDestroy() {
clearInterval(this.timer)
},
methods: {
trace() {
if (this.hash) {
this.error = null
this.$http.getTxs(this.hash).then(res => {
console.log('tx', res)
if (res.code === 0) {
this.succeed = true
clearInterval(this.timer)
} else if (res.code !== 3) { // code 3 is tx unconfirmed(not founded).
this.error = res.raw_log
console.log('error:', this.error)
clearInterval(this.timer)
}
}).catch(e => {
this.error = e
clearInterval(this.timer)
})
}
}, },
}, },
} }

View File

@ -53,7 +53,20 @@
@update="componentUpdate" @update="componentUpdate"
/> />
<b-row> <b-row>
<b-col> <b-col cols="12">
<b-form-group>
<b-form-checkbox
v-model="advance"
name="advance"
value="true"
>
<small>Advanced</small>
</b-form-checkbox>
</b-form-group>
</b-col>
</b-row>
<b-row v-if="advance">
<b-col cols="12">
<b-form-group <b-form-group
label="Fee" label="Fee"
label-for="Fee" label-for="Fee"
@ -78,19 +91,6 @@
</validation-provider> </validation-provider>
</b-form-group> </b-form-group>
</b-col> </b-col>
<b-col cols="12">
<b-form-group>
<b-form-checkbox
v-model="advance"
name="advance"
value="true"
>
<small>Advanced</small>
</b-form-checkbox>
</b-form-group>
</b-col>
</b-row>
<b-row v-if="advance">
<b-col cols="12"> <b-col cols="12">
<b-form-group <b-form-group
label="Gas" label="Gas"
@ -128,8 +128,7 @@
</b-form-group> </b-form-group>
</b-col> </b-col>
</b-row> </b-row>
<b-row v-if="advance">
<b-row>
<b-col> <b-col>
<wallet-input-vue v-model="wallet" /> <wallet-input-vue v-model="wallet" />
</b-col> </b-col>
@ -138,10 +137,10 @@
{{ error }} {{ error }}
</validation-observer> </validation-observer>
<TransactionResult v-else /> <TransactionResult
<b-button @click="showResult = !showResult"> v-else
toggle :hash="txHash"
</b-button> />
</b-overlay> </b-overlay>
</b-modal> </b-modal>
</template> </template>
@ -251,11 +250,12 @@ export default {
fee: '900', fee: '900',
feeDenom: '', feeDenom: '',
wallet: 'ledgerUSB', wallet: 'ledgerUSB',
gas: '200000', gas: '250000',
memo: '', memo: '',
blockingMsg: this.address ? 'You are not the owner' : 'No available account found.', blockingMsg: this.address ? 'You are not the owner' : 'No available account found.',
actionName: 'Send', actionName: 'Send',
showResult: false, showResult: false,
txHash: '',
required, required,
password, password,
@ -282,6 +282,7 @@ export default {
}, },
isOwner() { isOwner() {
if (this.accounts) { if (this.accounts) {
this.updateWallet(this.accounts.device)
if (this.accounts.address.findIndex(x => x.addr === this.selectedAddress) > -1) { if (this.accounts.address.findIndex(x => x.addr === this.selectedAddress) > -1) {
return false return false
} }
@ -323,10 +324,8 @@ export default {
}) })
this.fee = this.$store.state.chains.selected?.min_tx_fee || '1000' this.fee = this.$store.state.chains.selected?.min_tx_fee || '1000'
this.feeDenom = this.$store.state.chains.selected?.assets[0]?.base || '' this.feeDenom = this.$store.state.chains.selected?.assets[0]?.base || ''
// this.$refs.component.loadData()
}, },
componentUpdate(obj) { componentUpdate(obj) {
console.log(obj)
Object.keys(obj).forEach(key => { Object.keys(obj).forEach(key => {
this[key] = obj[key] this[key] = obj[key]
}) })
@ -345,10 +344,10 @@ export default {
resetModal() { resetModal() {
this.feeDenom = '' this.feeDenom = ''
this.error = null this.error = null
this.showResult = false
}, },
async sendTx() { async sendTx() {
const txMsgs = this.$refs.component.msg const txMsgs = this.$refs.component.msg
console.log(txMsgs)
if (txMsgs.length === 0) { if (txMsgs.length === 0) {
this.error = 'No delegation found' this.error = 'No delegation found'
return '' return ''
@ -383,22 +382,15 @@ export default {
this.memo, this.memo,
signerData, signerData,
).then(bodyBytes => { ).then(bodyBytes => {
this.showResult = true
this.$http.broadcastTx(bodyBytes, this.selectedChain).then(res => { this.$http.broadcastTx(bodyBytes, this.selectedChain).then(res => {
this.txHash = res.tx_response.txhash
setLocalTxHistory({ setLocalTxHistory({
chain: this.$store.state.chains.selected, chain: this.$store.state.chains.selected,
op: this.historyName, op: this.historyName,
hash: res.tx_response.txhash, hash: res.tx_response.txhash,
time: new Date(), time: new Date(),
}) })
this.$bvModal.hide('operation-modal')
this.$toast({
component: ToastificationContent,
props: {
title: 'Transaction sent!',
icon: 'EditIcon',
variant: 'success',
},
})
}).catch(e => { }).catch(e => {
console.log(e) console.log(e)
this.error = e this.error = e
@ -410,6 +402,13 @@ export default {
}) })
return '' return ''
}, },
updateWallet(v) {
console.log('device', v)
if (v && v !== 'address') {
this.wallet = v
}
this.wallet = 'keplr'
},
}, },
} }
</script> </script>