1
0
Fork 0
forked from lthn/blockchain

change fraction digits, premine transaction

This commit is contained in:
wildkif 2019-01-18 15:06:35 +02:00
parent d0906198b8
commit db1a9752b9
13 changed files with 10925 additions and 12082 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

@ -649,7 +649,7 @@ module.exports = function (NAME, wrapper, methods, common, IS_MAP, IS_WEAK) {
/*! no static exports found */
/***/ (function(module, exports) {
var core = module.exports = { version: '2.6.1' };
var core = module.exports = { version: '2.5.7' };
if (typeof __e == 'number') __e = core; // eslint-disable-line no-undef
@ -5497,8 +5497,8 @@ __webpack_require__.r(__webpack_exports__);
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(/*! D:\Projects\Zano\src\gui\qt-daemon\html_source\src\polyfills.ts */"./src/polyfills.ts");
module.exports = __webpack_require__(/*! D:\Projects\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:\zano_zano\src\gui\qt-daemon\html_source\src\polyfills.ts */"./src/polyfills.ts");
module.exports = __webpack_require__(/*! D:\zano_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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -6,10 +6,10 @@
"start": "ng serve",
"build": "ng build",
"build --watch": "ng build --output-path \"C:\\Program Files\\Zano\\html/\" --watch",
"build --html": "ng build --output-path \"../html/\"",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
"copy": "copyfiles -u 1 dist/**/* \"C:\\Program Files\\Zano\\html/\""
"e2e": "ng e2e"
},
"private": true,
"dependencies": {
@ -26,7 +26,6 @@
"@ngx-translate/core": "^11.0.0",
"@ngx-translate/http-loader": "^4.0.0",
"angular-highcharts": "^7.0.2",
"copyfiles": "^2.1.0",
"core-js": "^2.5.4",
"highcharts": "^6.2.0",
"idlejs": "^2.0.1",

View file

@ -12,8 +12,12 @@ export class IntToMoneyPipe implements PipeTransform {
if (value === 0 || value === undefined) {
return '0';
}
let maxFraction = this.variablesService.digits;
if (args) {
maxFraction = parseInt(args, 10);
}
const power = Math.pow(10, this.variablesService.digits);
let str = (value / power).toFixed(this.variablesService.digits);
let str = (value / power).toFixed(maxFraction);
for (let i = str.length - 1; i >= 0; i--) {
if (str[i] !== '0') {
str = str.substr(0, i + 1);

View file

@ -13,7 +13,7 @@
<tr *ngFor="let item of variablesService.currentWallet.history">
<td>
<div class="status" [class.send]="!item.is_income" [class.received]="item.is_income">
<ng-container *ngIf="variablesService.height_app - item.height < 10 || item.height === 0 || (item.is_mining && item.height === 0)">
<ng-container *ngIf="variablesService.height_app - item.height < 10 || (item.height === 0 && item.timestamp > 0) || (item.is_mining && item.height === 0)">
<div class="confirmation" tooltip="{{ 'HISTORY.STATUS_TOOLTIP' | translate : {'current': getHeight(item)/10, 'total': 10} }}" placement="bottom" tooltipClass="history-tooltip" [delay]="500">
<div class="fill" [style.height]="getHeight(item) + '%'"></div>
</div>

View file

@ -6,7 +6,7 @@
<div class="sidebar-account" *ngFor="let wallet of variablesService.wallets" [class.active]="wallet?.wallet_id === walletActive" [routerLink]="['/wallet/' + wallet.wallet_id + '/history']">
<div class="sidebar-account-row account-title-balance">
<span class="title">{{wallet.name}}</span>
<span class="balance">{{wallet.unlocked_balance | intToMoney}} {{variablesService.defaultCurrency}}</span>
<span class="balance">{{wallet.unlocked_balance | intToMoney : '3' }} {{variablesService.defaultCurrency}}</span>
</div>
<div class="sidebar-account-row account-alias">
<span>{{wallet.alias}}</span>

View file

@ -22,7 +22,7 @@
<i class="icon copy" (click)="copyAddress()"></i>
</div>
<div class="balance">
<span [tooltip]="getTooltip()" [placement]="'bottom'" [tooltipClass]="'balance-tooltip'" [delay]="500" [timeout]="1000">{{variablesService.currentWallet.balance | intToMoney}} {{variablesService.defaultCurrency}}</span>
<span [tooltip]="getTooltip()" [placement]="'bottom'" [tooltipClass]="'balance-tooltip'" [delay]="500" [timeout]="1000">{{variablesService.currentWallet.balance | intToMoney : '3'}} {{variablesService.defaultCurrency}}</span>
<span>$ {{variablesService.currentWallet.getMoneyEquivalent(variablesService.moneyEquivalent) | intToMoney | number : '1.2-2'}}</span>
</div>
<div class="tabs">