Skip to content

Commit 407abbc

Browse files
TarekAwwadTarekAwwad
authored
Merge pull request #18 from KiFoundation/features/withdraw
Features/withdraw
2 parents bb34e12 + 5b7e5de commit 407abbc

Some content is hidden

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

45 files changed

+1664
-401
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.2.2</title>
8+
<title>Ki Wallet 0.3.0 beta</title>
99
</head>
1010

1111
<body>

‎app/package-lock.json

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

‎app/package.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Ki-Wallet",
3-
"version": "0.2.2",
3+
"version": "0.3.0",
44
"description": "ki-wallet",
55
"author": "Ki Foundation",
66
"private": true,
@@ -16,34 +16,34 @@
1616
"@fortawesome/vue-fontawesome": "^0.1.9",
1717
"@tendermint/sig": "^0.4.1",
1818
"acorn": ">=5.7.4",
19-
"axios": "^0.19.2",
19+
"axios": "^0.21.1",
2020
"bip39": "^3.0.2",
2121
"bootstrap": "^4.4.1",
2222
"bootstrap-vue": "^2.12.0",
2323
"clipboard": "^2.0.4",
2424
"crypto-js": "^4.0.0",
25-
"electron": "^8.2.4",
25+
"electron": ">=8.5.2",
2626
"es6-promise": "^4.2.8",
27+
"gsap": "^3.5.1",
2728
"jquery": "^3.4.1",
2829
"kind-of": ">=6.0.3",
2930
"minimist": ">=0.2.1",
3031
"numeral": "^2.0.6",
3132
"popper.js": "^1.15.0",
3233
"request": "^2.88.2",
3334
"vue": "^2.5.2",
35+
"vue-clipboard2": "^0.3.1",
3436
"vue-context": "^5.2.0",
3537
"vue-cookie": "^1.1.4",
3638
"vue-foldable": "^1.0.0",
3739
"vue-i18n": "^8.11.2",
3840
"vue-js-toggle-button": "^1.3.3",
3941
"vue-resource": "^1.5.1",
4042
"vue-router": "^3.0.1",
41-
"vue-simple-context-menu": "^3.1.10",
4243
"vue-unicons": "^2.1.0",
4344
"vuex": "^3.3.0"
4445
},
4546
"devDependencies": {
46-
"acorn": ">=5.7.4",
4747
"autoprefixer": "^7.1.2",
4848
"babel-core": "^6.22.1",
4949
"babel-eslint": "^10.1.0",
@@ -68,10 +68,8 @@
6868
"friendly-errors-webpack-plugin": "^1.6.1",
6969
"html-webpack-plugin": "^2.30.1",
7070
"js-yaml": ">=3.13.1",
71-
"kind-of": ">=6.0.3",
7271
"lodash": ">=4.17.19",
7372
"mem": ">=4.0.0",
74-
"minimist": ">=0.2.1",
7573
"mixin-deep": ">=1.3.2",
7674
"node-notifier": "^5.1.2",
7775
"optimize-css-assets-webpack-plugin": "^3.2.0",

‎app/src/App.vue

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ import {
2424
} from 'vuex';
2525
import {
2626
SET_WALLETS_LIST,
27-
SET_WALLETS_DICT
27+
SET_WALLETS_DICT,
28+
SET_CATEGORY_LIST
2829
} from '@store/wallets';
2930
import {
30-
SET_ACCOUNT
31+
SET_ACCOUNT,
32+
GET_PRICE
3133
} from '@store/account';
3234
import {
3335
FETCH_VALIDATORS_LIST
@@ -81,26 +83,32 @@ export default {
8183
wallets: [],
8284
delegations: {},
8385
transactions: [],
86+
categories: '',
8487
};
8588
},
8689
created() {
8790
const bootstrap = async () => {
8891
await this.getChain();
8992
await this.getAccounts();
9093
await this.fetchValidatorsList();
94+
await this.getPrice();
9195
this.isLoading = false;
9296
};
9397
bootstrap();
9498
},
95-
mounted() {},
99+
mounted() {
100+
this.getCategories();
101+
},
96102
methods: {
97103
...mapMutations({
98104
setWalletsList: SET_WALLETS_LIST,
99105
setWalletsDict: SET_WALLETS_DICT,
100106
setAccount: SET_ACCOUNT,
107+
setCategoryList: SET_CATEGORY_LIST,
101108
}),
102109
...mapActions({
103110
fetchValidatorsList: FETCH_VALIDATORS_LIST,
111+
getPrice: GET_PRICE,
104112
}),
105113
getChain() {
106114
return new Promise(async res => {
@@ -126,6 +134,17 @@ export default {
126134
res(1);
127135
});
128136
},
137+
getCategories(){
138+
let categories = [];
139+
if (localStorage.getItem('categories')) {
140+
categories = localStorage.getItem('categories').split(',');
141+
}else{
142+
categories = ['personal','work','multisignature','uncategorized']
143+
localStorage.setItem('categories', categories);
144+
}
145+
this.categories = categories.join(",");
146+
this.setCategoryList(categories);
147+
},
129148
getAccounts() {
130149
return new Promise(res => {
131150
if (localStorage.getItem('wallet_list')) {
@@ -164,7 +183,8 @@ export default {
164183
publickey: Buffer.from(lse_temp.publicKey, ).toString('hex'),
165184
ms: lse_temp.ms,
166185
offline: lse_temp.offline,
167-
invalid: lse_temp.invalid
186+
invalid: lse_temp.invalid,
187+
category: (lse_temp.category != undefined && this.categories.includes(lse_temp.category)) ? lse_temp.category : "uncategorized"
168188
}
169189
170190
if (wallet_tmp.ms) {
@@ -177,7 +197,6 @@ export default {
177197
}
178198
}
179199
}
180-
181200
this.setWalletsList(wallets);
182201
this.setWalletsDict(wallets_dict);
183202
res(1);

0 commit comments

Comments
 (0)