Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Nazar
45fe1403f5
fix status wallet in btn setting (#267) 2020-12-11 14:12:48 +01:00
9 changed files with 62 additions and 117 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -5800,8 +5800,8 @@ __webpack_require__.r(__webpack_exports__);
/*! no static exports found */ /*! no static exports found */
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
__webpack_require__(/*! D:\Project\WORK_NEW\zano\src\gui\qt-daemon\html_source\src\polyfills.ts */"./src/polyfills.ts"); __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_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"); 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");
/***/ }) /***/ })

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

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": /***/ "./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 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 Mode = __webpack_require__(/*! ./mode */ "./node_modules/qrcode/lib/core/mode.js")
var Segments = __webpack_require__(/*! ./segments */ "./node_modules/qrcode/lib/core/segments.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 * 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 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 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 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 // 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) 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 () { function typedArraySupport () {
// Can typed array instances be augmented? // 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": /***/ "./node_modules/rxjs/_esm5/index.js":

File diff suppressed because one or more lines are too long

View file

@ -16,7 +16,7 @@
</div> </div>
</div> </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> <i class="icon details"></i>
</button> </button>
</div> </div>

View file

@ -234,7 +234,6 @@ export class WalletComponent implements OnInit, OnDestroy {
} }
} }
); );
this.updateWalletStatus();
} }
resetPaginationValues() { resetPaginationValues() {
this.ngZone.run(() => { this.ngZone.run(() => {
@ -456,30 +455,4 @@ export class WalletComponent implements OnInit, OnDestroy {
} }
clearTimeout(this.copyAnimationTimeout); 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;
}
});
});
}
} }