Skip to content

Commit df4148d

Browse files
authored
Merge pull request #50 from KiFoundation/send-txs-sdk-v45.3
Send txs sdk v45.3
2 parents a0e8d8c + b38c257 commit df4148d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+3519
-5486
lines changed

app/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta charset="utf-8">
66
<meta name="viewport" content="width=device-width,initial-scale=1.0">
77
<link rel="shortcut icon" type="image/png" href="static/img/chain/[email protected]">
8-
<title>Ki Wallet 0.4.2</title>
8+
<title>Ki Wallet 0.4.3</title>
99
</head>
1010

1111
<body>

app/package-lock.json

Lines changed: 645 additions & 75 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Ki-Wallet",
3-
"version": "0.4.2",
3+
"version": "0.4.3",
44
"description": "ki-wallet",
55
"author": "Ki Foundation",
66
"private": true,
@@ -12,10 +12,12 @@
1212
},
1313
"dependencies": {
1414
"@cosmjs/amino": "^0.26.4",
15+
"@cosmjs/ledger-amino": "^0.28.4",
1516
"@cosmjs/stargate": "^0.26.4",
1617
"@fortawesome/fontawesome-svg-core": "^1.2.28",
1718
"@fortawesome/free-solid-svg-icons": "^5.13.0",
1819
"@fortawesome/vue-fontawesome": "^0.1.9",
20+
"@ledgerhq/hw-transport-node-hid": "^6.27.1",
1921
"@tendermint/amino-js": "^0.6.2",
2022
"@tendermint/sig": "^0.4.1",
2123
"acorn": ">=5.7.4",
@@ -48,7 +50,6 @@
4850
"vuex": "^3.3.0"
4951
},
5052
"devDependencies": {
51-
"electron": ">=11.1.0",
5253
"autoprefixer": "^7.1.2",
5354
"babel-core": "^6.22.1",
5455
"babel-eslint": "^10.1.0",
@@ -62,6 +63,7 @@
6263
"chalk": "^2.0.1",
6364
"copy-webpack-plugin": "^4.0.1",
6465
"css-loader": "^0.28.0",
66+
"electron": ">=11.1.0",
6567
"eslint": "^6.8.0",
6668
"eslint-config-prettier": "^6.11.0",
6769
"eslint-loader": "^4.0.0",

app/src/components/error/modals/index.vue

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,6 @@
1919
</template>
2020

2121
<script>
22-
import {
23-
KeyPair,
24-
signTx,
25-
verifyTx,
26-
createWalletFromMnemonic,
27-
createBroadcastTx,
28-
} from '@tendermint/sig';
29-
import {
30-
BContainer,
31-
BModal,
32-
BTooltip,
33-
} from 'bootstrap-vue';
34-
import {
35-
mapState,
36-
mapActions,
37-
mapGetters
38-
} from 'vuex';
39-
40-
import {
41-
GET_CURRENT_WALLET_BALANCES_AMOUNT,
42-
GET_CURRENT_WALLET_BALANCES_DENOM,
43-
HYDRATE_CURRENT_WALLET,
44-
} from '@store/wallets';
4522
4623
export default {
4724
components: {

app/src/components/private-layout/topbar/no-wallet-actions.vue

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}"
1515
>
1616

17-
≈ ${{total_usd}} (${{ token_price }}/{{ globalData.kichain.token }})
17+
≈ ${{total_usd}} (${{token_price}}/{{ globalData.kichain.token }})
1818
</p>
1919

2020
</div>
@@ -86,7 +86,7 @@ export default {
8686
...mapState({
8787
loadingWallet: state => state.wallets.loading,
8888
wallets: state => state.wallets.list,
89-
token_price: state => state.price,
89+
token_price_raw: state => state.price,
9090
}),
9191
},
9292
data() {
@@ -98,7 +98,7 @@ export default {
9898
token: '',
9999
total:0,
100100
total_usd:0,
101-
// token_price:0.06
101+
token_price: 0.00
102102
};
103103
},
104104
mounted() {
@@ -230,8 +230,9 @@ export default {
230230
}
231231
}
232232
}
233-
this.total_usd = tokenUtil.formatShort(total * this.token_price);
233+
this.total_usd = tokenUtil.formatShort(total * this.token_price_raw);
234234
this.total = tokenUtil.formatShort(total)
235+
this.token_price = tokenUtil.formatPrice(this.token_price_raw);
235236
}
236237
},
237238
};

0 commit comments

Comments
 (0)