Merge pull request #118 from NazarUsov/testnet/issues

How fix view asset info
hyle-team · Jun 22, 2024 · b489a82 · b489a82
2 parents 9be6a53 + 04729b9
commit b489a82
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/html_source/package.json b/html_source/package.json
@@ -5,7 +5,7 @@
         "ng": "ng",
         "start": "ng serve",
         "build": "ng build",
-        "build --watch": "ng build --output-path \"D:/work/nazar/Zano/html\" --watch",
+        "build --watch": "ng build --output-path \"/Applications/Zano.app/Contents/MacOS/html\" --watch",
         "build --html": "node update-build-time.js && ng build --output-path \"../html/\"",
         "test": "ng test",
         "lint": "ng lint",

diff --git a/html_source/src/app/parts/modals/asset-details/asset-details.component.ts b/html_source/src/app/parts/modals/asset-details/asset-details.component.ts
@@ -52,9 +52,9 @@ import { ParamsCallRpc } from '@api/models/call_rpc.model';
                                 </div>
                                 <div class="text">
                                     {{
-                                        asset.asset_info.asset_id === zanoAssetInfo.asset_id
+                                        (asset.asset_info.asset_id === zanoAssetInfo.asset_id
                                             ? zano_current_supply
-                                            : asset.asset_info.current_supply
+                                            : asset.asset_info.current_supply) | intToMoney: asset.asset_info.decimal_point
                                     }}
                                 </div>
                             </div>
@@ -69,7 +69,7 @@ import { ParamsCallRpc } from '@api/models/call_rpc.model';
                                     {{
                                         asset.asset_info.asset_id === zanoAssetInfo.asset_id
                                             ? 'Uncapped'
-                                            : asset.asset_info.total_max_supply
+                                            : (asset.asset_info.total_max_supply | intToMoney: asset.asset_info.decimal_point)
                                     }}
                                 </div>
                             </div>

diff --git a/html_source/src/app/parts/modals/asset-details/asset-details.module.ts b/html_source/src/app/parts/modals/asset-details/asset-details.module.ts
@@ -3,10 +3,11 @@ import { CommonModule } from '@angular/common';
 import { AssetDetailsComponent } from '@parts/modals/asset-details/asset-details.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { FlexModule } from '@angular/flex-layout';
+import { IntToMoneyPipeModule } from '@parts/pipes';
 
 @NgModule({
     declarations: [AssetDetailsComponent],
     exports: [AssetDetailsComponent],
-    imports: [CommonModule, TranslateModule, FlexModule],
+    imports: [CommonModule, TranslateModule, FlexModule, IntToMoneyPipeModule],
 })
 export class AssetDetailsModule {}
diff --git a/html_source/src/app/parts/pipes/int-to-money-pipe/int-to-money.pipe.ts b/html_source/src/app/parts/pipes/int-to-money-pipe/int-to-money.pipe.ts
@@ -16,7 +16,7 @@ export class IntToMoneyPipe implements PipeTransform {
         if (args) {
             maxFraction = parseInt(args, 10);
         }
-        const power = Math.pow(10, this.variablesService.digits);
+        const power = Math.pow(10, maxFraction);
         let str = new BigNumber(value).div(power).toFixed(maxFraction);
 
         for (let i = str.length - 1; i >= 0; i--) {