Skip to content

Commit

Permalink
Merge branch 'master' into mainnet
Browse files Browse the repository at this point in the history
  • Loading branch information
shrpne committed Jun 18, 2020
2 parents b0794ba + 0efae46 commit 7400493
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion components/TransactionLatestList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@
<div class="table__inner-item" v-if="tx.data.check && tx.data.check.sender">
<strong>{{ $td('Check Issuer', 'wallet.tx-table-check-issuer') }}</strong> <br>
<TableLink :link-text="tx.data.check.sender"
:link-path="'/address/' + tx.data.check.sender"
:link-path="getExplorerAddressUrl(tx.data.check.sender)"
:should-not-shorten="true"
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/common/SignatureList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<div class="u-grid u-grid--small u-grid--vertical-margin">
<div class="multisig-signature__cell u-cell" v-for="(v, index) in $v.list.$each.$iter" :key="index">
<label class="form-field multisig-signature__field" :class="{'is-error': v.signature.$error}">
<textarea class="form-field__input" type="text" autocapitalize="off" spellcheck="false" rows="1" v-check-empty v-autosize
<textarea class="form-field__input" autocapitalize="off" spellcheck="false" rows="1" v-check-empty v-autosize
v-model.trim="v.signature.$model"
@blur="v.signature.$touch()"
></textarea>
Expand Down
1 change: 0 additions & 1 deletion components/common/TxForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import {isValidMnemonic} from 'minterjs-wallet';
import {prepareTx, makeSignature} from 'minter-js-sdk/src/tx';
import {postTx, ensureNonce} from '~/api/gate.js';
import {getTransaction} from '~/api';
import FeeBus from '~/assets/fee.js';
import checkEmpty from '~/assets/v-check-empty.js';
import {getServerValidator, fillServerErrors, getErrorText} from "~/assets/server-error.js";
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "minter-console-web",
"version": "0.6.3",
"version": "0.6.4",
"description": "Minter Console Website",
"author": "shrpne <[email protected]>",
"private": true,
Expand Down

0 comments on commit 7400493

Please sign in to comment.