Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
LukasBures committed Aug 11, 2018
2 parents 9b5d8ba + 4a7f6a7 commit b0b8622
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 38 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@

# Version History

## v1.1.91
- [x] FIX: generate new T address
- [x] FIX: max button

## v1.1.9
- [x] Batch Split
- [x] Add certificate login to the Secure Node
Expand Down
33 changes: 17 additions & 16 deletions app/zwallet.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ let depositQrcodeTimer;
let addrObjList;
let addrIdxByAddr;
let refreshCounter = 0;
let maxAmount = 0;

// ---------------------------------------------------------------------------------------------------------------------
// IPC
Expand Down Expand Up @@ -240,20 +241,18 @@ function createAddrItem(addrObj) {

setAddressNodeName(addrObj, addrItem.getElementsByClassName("addrName")[0]);
addrItem.getElementsByClassName("addrText")[0].textContent = formatAddressInList(addrObj.addr);
addrItem.getElementsByClassName("addrNameLine")[0]
.addEventListener("click", () => showAddrDetail(addrObj.addr));
addrItem.getElementsByClassName("addrDepositButton")[0]
.addEventListener("click", () => {
depositToAddrInput.value = addrObj.addr;
updateDepositQrcode();
depositTabButton.click();
});
addrItem.getElementsByClassName("addrWithdrawButton")[0]
.addEventListener("click", () => {
withdrawFromAddrInput.value = addrObj.addr;
validateWithdrawForm();
withdrawTabButton.click();
});
addrItem.getElementsByClassName("addrNameLine")[0].addEventListener("click", () => showAddrDetail(addrObj.addr));
addrItem.getElementsByClassName("addrDepositButton")[0].addEventListener("click", () => {
depositToAddrInput.value = addrObj.addr;
updateDepositQrcode();
depositTabButton.click();
});
addrItem.getElementsByClassName("addrWithdrawButton")[0].addEventListener("click", () => {
maxAmount = addrObj.lastbalance;
withdrawFromAddrInput.value = addrObj.addr;
validateWithdrawForm();
withdrawTabButton.click();
});

setAddrItemBalance(addrItem, addrObj.lastbalance);
return addrItem;
Expand Down Expand Up @@ -444,7 +443,10 @@ function showNewAddrDialog() {
}
createButton.addEventListener("click", () => {
let getT = dialog.querySelector(".TorZgetT").checked;
let getZ = dialog.querySelector(".TorZgetZ").checked;
let getZ = false;
if (dialog.querySelector(".TorZgetZ")) {
getZ = dialog.querySelector(".TorZgetZ").checked;
}
let nameAddress = dialog.querySelector(".newAddrDialogName").value;
if (getT) {
ipcRenderer.send("generate-wallet", nameAddress);
Expand Down Expand Up @@ -653,7 +655,6 @@ async function sendPendingTxs() {
}

async function initWithdrawView() {
let maxAmount = 0;
withdrawFromAddrInput.addEventListener("input", validateWithdrawForm);
withdrawToAddrInput.addEventListener("input", validateWithdrawForm);
withdrawAmountInput.addEventListener("input", validateWithdrawForm);
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": "Arizen",
"version": "1.1.9",
"version": "1.1.91",
"description": "Arizen is light API wallet for ZenCash with localy stored and encrypted files.",
"main": "app/main.js",
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions release.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"url": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9/Arizen-1.1.9-mac.zip",
"name": "1.1.9",
"url": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.91/Arizen-1.1.91-mac.zip",
"name": "1.1.91",
"notes": "1st Version",
"pub_date": "3-8-2018"
"pub_date": "11-8-2018"
}
36 changes: 18 additions & 18 deletions updates.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
{
"linux-x64-prod": {
"readme": "1st version",
"update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9/Arizen-1.1.9-x96_64.AppImage",
"install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9/Arizen-1.1.9-x96_64.AppImage",
"version": "1.1.9"
"update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.91/Arizen-1.1.91-x96_64.AppImage",
"install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.91/Arizen-1.1.91-x96_64.AppImage",
"version": "1.1.91"
},
"win32-x64-prod": {
"readme": "1st version",
"update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9",
"install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9",
"version": "1.1.9"
"update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.91",
"install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.91",
"version": "1.1.91"
},
"darwin-x64-prod": {
"readme": "1st version",
"update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9/release.json",
"install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9/Arizen-1.1.9.dmg",
"version": "1.1.9"
"update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.91/release.json",
"install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.91/Arizen-1.1.91.dmg",
"version": "1.1.91"
},
"linux-x64-beta": {
"readme": "beta version",
"update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9/Arizen-1.1.9-x96_64.AppImage",
"install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9/Arizen-1.1.9-x96_64.AppImage",
"version": "1.1.9-beta"
"update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.91/Arizen-1.1.91-x96_64.AppImage",
"install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.91/Arizen-1.1.91-x96_64.AppImage",
"version": "1.1.91-beta"
},
"win32-x64-beta": {
"readme": "beta version",
"update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9",
"install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9",
"version": "1.1.9-beta"
"update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.91",
"install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.91",
"version": "1.1.91-beta"
},
"darwin-x64-beta": {
"readme": "beta version",
"update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9/release.json",
"install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9/Arizen-1.1.9.dmg",
"version": "1.1.9-beta"
"update": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.91/release.json",
"install": "https://github.com/ZencashOfficial/arizen/releases/download/v1.1.91/Arizen-1.1.91.dmg",
"version": "1.1.91-beta"
}
}

0 comments on commit b0b8622

Please sign in to comment.