Skip to content

Dexw 2122 release 1.4.1 #1639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vba2000 merged 4 commits into from
Sep 11, 2019
Merged

Dexw 2122 release 1.4.1 #1639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3c1542
DEXW-2122: Hotfix
Sep 11, 2019
9ce3d58
Merge branch 'dev' into dexw-2122-release-1.4.1
jahsus-waves Sep 11, 2019
b7f211f
DEXW-2122: update locale files
jahsus-waves Sep 11, 2019
4949115
DEXW-2122: update version
jahsus-waves Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion locale/zh_CN/app.utils.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@
"backupPhrase": "备份短语",
"base58Seed": "编码备份短语",
"encodedSeed": "编码的SEED",
"id": "Account ID",
"id": "帐户ID",
"privateKey": "私钥",
"publicKey": "公钥",
"script": "脚本",
Expand Down
2 changes: 1 addition & 1 deletion locale/zh_CN/app.welcome.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
}
},
"userList": {
"addNew": "添加一个帐号",
"addNew": "新增帐户",
"back": "返回",
"create": "创建新的帐号",
"frombackup": "备份",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "waves-client",
"version": "1.4.0",
"version": "1.4.1",
"description": "The official client application for the Waves platform",
"private": true,
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/utils/modals/confirmDeleteUser/confirmDeleteUserCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
class confirmDeleteUserCtrl {

constructor(locals) {
this.hasBackup = locals.user.settings.hasBackup;
this.hasBackup = locals.user.settings ? locals.user.settings.hasBackup : false;
this.isSeed = !locals.user.userType || locals.user.userType === 'seed';
this.isLedger = locals.user.userType === 'ledger';
this.isKeeper = locals.user.userType === 'wavesKeeper';
Expand Down