Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

fix status wallet in btn setting (#267)

Browse source
This commit is contained in:
Nazar 2020-12-11 15:12:48 +02:00 • committed by GitHub
parent 0a22f94030
commit 45fe1403f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 62 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
src/gui/qt-daemon/html/main.js
View file

File diff suppressed because one or more lines are too long

2
src/gui/qt-daemon/html/main.js.map
View file

File diff suppressed because one or more lines are too long

4
src/gui/qt-daemon/html/polyfills.js
View file

@ -5800,8 +5800,8 @@ __webpack_require__.r(__webpack_exports__);
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(/*! D:\Project\WORK_NEW\zano\src\gui\qt-daemon\html_source\src\polyfills.ts */"./src/polyfills.ts");
module.exports = __webpack_require__(/*! D:\Project\WORK_NEW\zano\src\gui\qt-daemon\html_source\node_modules\@angular-devkit\build-angular\src\angular-cli-files\models\jit-polyfills.js */"./node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/jit-polyfills.js");
__webpack_require__(/*! D:\Project\WORK\zano\src\gui\qt-daemon\html_source\src\polyfills.ts */"./src/polyfills.ts");
module.exports = __webpack_require__(/*! D:\Project\WORK\zano\src\gui\qt-daemon\html_source\node_modules\@angular-devkit\build-angular\src\angular-cli-files\models\jit-polyfills.js */"./node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/jit-polyfills.js");
/***/ })

4
src/gui/qt-daemon/html/styles.js
View file

File diff suppressed because one or more lines are too long

2
src/gui/qt-daemon/html/styles.js.map
View file

File diff suppressed because one or more lines are too long

38
src/gui/qt-daemon/html/vendor.js
View file

@ -98251,22 +98251,6 @@ exports.write = function (buffer, value, offset, isLE, mLen, nBytes) {
}
/***/ }),
/***/ "./node_modules/isarray/index.js":
/*!***************************************!*\
!*** ./node_modules/isarray/index.js ***!
\***************************************/
/*! no static exports found */
/***/ (function(module, exports) {
var toString = {}.toString;
module.exports = Array.isArray || function (arr) {
return toString.call(arr) == '[object Array]';
};
/***/ }),
/***/ "./node_modules/json-bignumber/node_modules/bignumber.js/bignumber.js":
@ -121702,7 +121686,7 @@ var Version = __webpack_require__(/*! ./version */ "./node_modules/qrcode/lib/co
var FormatInfo = __webpack_require__(/*! ./format-info */ "./node_modules/qrcode/lib/core/format-info.js")
var Mode = __webpack_require__(/*! ./mode */ "./node_modules/qrcode/lib/core/mode.js")
var Segments = __webpack_require__(/*! ./segments */ "./node_modules/qrcode/lib/core/segments.js")
var isArray = __webpack_require__(/*! isarray */ "./node_modules/isarray/index.js")
var isArray = __webpack_require__(/*! isarray */ "./node_modules/qrcode/node_modules/isarray/index.js")
/**
* QRCode for JavaScript
@ -122749,7 +122733,7 @@ var ECCode = __webpack_require__(/*! ./error-correction-code */ "./node_modules/
var ECLevel = __webpack_require__(/*! ./error-correction-level */ "./node_modules/qrcode/lib/core/error-correction-level.js")
var Mode = __webpack_require__(/*! ./mode */ "./node_modules/qrcode/lib/core/mode.js")
var VersionCheck = __webpack_require__(/*! ./version-check */ "./node_modules/qrcode/lib/core/version-check.js")
var isArray = __webpack_require__(/*! isarray */ "./node_modules/isarray/index.js")
var isArray = __webpack_require__(/*! isarray */ "./node_modules/qrcode/node_modules/isarray/index.js")
// Generator polynomial used to encode version information
var G18 = (1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0)
@ -123203,7 +123187,7 @@ exports.qrToImageData = function qrToImageData (imgData, qr, opts) {
var isArray = __webpack_require__(/*! isarray */ "./node_modules/isarray/index.js")
var isArray = __webpack_require__(/*! isarray */ "./node_modules/qrcode/node_modules/isarray/index.js")
function typedArraySupport () {
// Can typed array instances be augmented?
@ -123716,6 +123700,22 @@ module.exports.from = function (data) {
}
/***/ }),
/***/ "./node_modules/qrcode/node_modules/isarray/index.js":
/*!***********************************************************!*\
!*** ./node_modules/qrcode/node_modules/isarray/index.js ***!
\***********************************************************/
/*! no static exports found */
/***/ (function(module, exports) {
var toString = {}.toString;
module.exports = Array.isArray || function (arr) {
return toString.call(arr) == '[object Array]';
};
/***/ }),
/***/ "./node_modules/rxjs/_esm5/index.js":

2
src/gui/qt-daemon/html/vendor.js.map
View file

File diff suppressed because one or more lines are too long

2
src/gui/qt-daemon/html_source/src/app/wallet/wallet.component.html
View file

@ -16,7 +16,7 @@
</div>
</div>
<div>
<button [routerLink]="['/details']" routerLinkActive="active" tooltip="{{ 'WALLET.TOOLTIPS.SETTINGS' | translate }}" placement="left" tooltipClass="table-tooltip account-tooltip" [delay]="500" [timeDelay]="500" [disabled]="variablesService.daemon_state !== 2 || !walletLoaded">
<button [routerLink]="['/details']" routerLinkActive="active" tooltip="{{ 'WALLET.TOOLTIPS.SETTINGS' | translate }}" placement="left" tooltipClass="table-tooltip account-tooltip" [delay]="500" [timeDelay]="500" [disabled]="variablesService.daemon_state !== 2 || !variablesService.currentWallet.loaded">
<i class="icon details"></i>
</button>
</div>

27
src/gui/qt-daemon/html_source/src/app/wallet/wallet.component.ts
View file

@ -234,7 +234,6 @@ export class WalletComponent implements OnInit, OnDestroy {
}
}
);
this.updateWalletStatus();
}
resetPaginationValues() {
this.ngZone.run(() => {
@ -456,30 +455,4 @@ export class WalletComponent implements OnInit, OnDestroy {
}
clearTimeout(this.copyAnimationTimeout);
}
updateWalletStatus() {
this.backend.eventSubscribe('wallet_sync_progress', (data) => {
const wallet_id = data.wallet_id;
if (wallet_id === this.walletID) {
this.ngZone.run(() => {
this.walletLoaded = false;
});
}
});
this.backend.eventSubscribe('update_wallet_status', (data) => {
const wallet_state = data.wallet_state;
const wallet_id = data.wallet_id;
this.ngZone.run(() => {
if (wallet_state === 2 && wallet_id === this.walletID) {
this.walletLoaded =
this.variablesService.getWallet(this.walletID) !== null &&
this.variablesService.getWallet(this.walletID).loaded
? true
: false;
} else {
this.walletLoaded = false;
}
});
});
}
}