Merge pull request #1053 from numbersprotocol/feature-show-num-balance

Feature show num balance

Author: shc261392

src/app/features/profile/profile.page.html

@@ -10,12 +10,23 @@
 <div *transloco="let t" class="page-content">
   <mat-list>
     <mat-list-item>
-      <ion-icon mat-list-icon src="/assets/images/numbers_token.svg"></ion-icon>
-      <div mat-line>{{ t('balance') }}</div>
-      <div mat-line>NUM</div>
-      <div class="capt-balance">
+      <ion-icon mat-list-icon src="/assets/images/num-icon.svg"></ion-icon>
+      <div mat-line>NUM {{ t('balance') }}</div>
+      <div mat-line>ERC20</div>
+      <div class="num-balance">
         <ng-container *ngIf="networkConnected$ | ngrxPush; else offline">
-          $ {{ captBalance$ | ngrxPush | number: '1.2-2' }}
+          $ {{ ethNumBalance$ | ngrxPush | number: '1.2-2' }}
+        </ng-container>
+        <ng-template #offline> --offline-- </ng-template>
+      </div>
+    </mat-list-item>
+    <mat-list-item>
+      <ion-icon mat-list-icon src="/assets/images/num-icon.svg"></ion-icon>
+      <div mat-line>NUM {{ t('balance') }}</div>
+      <div mat-line>BEP20</div>
+      <div class="num-balance">
+        <ng-container *ngIf="networkConnected$ | ngrxPush; else offline">
+          $ {{ bscNumBalance$ | ngrxPush | number: '1.2-2' }}
         </ng-container>
         <ng-template #offline> --offline-- </ng-template>
       </div>

src/app/features/profile/profile.page.scss

@@ -23,7 +23,7 @@ app-avatar {
     color: var(--noir-warn);
   }
 
-  .capt-balance {
+  .num-balance {
     margin-right: 8px;
   }
 }

src/app/features/profile/profile.page.ts

@@ -32,7 +32,8 @@ export class ProfilePage {
   readonly privateKey$ = this.webCryptoApiSignatureProvider.privateKey$;
   readonly phoneVerified$ = this.diaBackendAuthService.phoneVerified$;
   readonly emailVerified$ = this.diaBackendAuthService.emailVerified$;
-  readonly captBalance$ = this.diaBackendWalletService.captBalance$;
+  readonly ethNumBalance$ = this.diaBackendWalletService.ethNumBalance$;
+  readonly bscNumBalance$ = this.diaBackendWalletService.bscNumBalance$;
   readonly networkConnected$ = this.diaBackendWalletService.networkConnected$;
 
   constructor(

src/app/shared/dia-backend/wallet/dia-backend-wallet.service.ts

@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { defer } from 'rxjs';
+import { defer, forkJoin } from 'rxjs';
 import { concatMap } from 'rxjs/operators';
 import { NetworkService } from '../../network/network.service';
 import { PreferenceManager } from '../../preference-manager/preference-manager.service';
@@ -15,7 +15,12 @@ export class DiaBackendWalletService {
 
   private readonly preferences = this.preferenceManager.getPreferences(this.id);
 
-  readonly captBalance$ = this.preferences.getNumber$(PrefKeys.CAPT_BALANCE);
+  readonly ethNumBalance$ = this.preferences.getNumber$(
+    PrefKeys.ETH_NUM_BALANCE
+  );
+  readonly bscNumBalance$ = this.preferences.getNumber$(
+    PrefKeys.BSC_NUM_BALANCE
+  );
 
   readonly networkConnected$ = this.networkService.connected$;
 
@@ -63,12 +68,18 @@ export class DiaBackendWalletService {
   }
 
   syncCaptBalance$() {
-    return this.getManagedWallet$().pipe(
+    return this.getAssetWallet$().pipe(
       concatMap(diaBackendWallet =>
-        this.preferences.setNumber(
-          PrefKeys.CAPT_BALANCE,
-          diaBackendWallet.capt_balance
-        )
+        forkJoin([
+          this.preferences.setNumber(
+            PrefKeys.ETH_NUM_BALANCE,
+            diaBackendWallet.num_balance.eth_num
+          ),
+          this.preferences.setNumber(
+            PrefKeys.BSC_NUM_BALANCE,
+            diaBackendWallet.num_balance.bsc_num
+          ),
+        ])
       )
     );
   }
@@ -78,12 +89,17 @@ export interface DiaBackendWallet {
   id: string;
   type: string;
   capt_balance: number;
+  num_balance: {
+    bsc_num: number;
+    eth_num: number;
+  };
   address: string;
   private_key: string;
   created_at: string;
   owner: string;
 }
 
 const enum PrefKeys {
-  CAPT_BALANCE = 'CAPT_BALANCE',
+  ETH_NUM_BALANCE = 'ETH_NUM_BALANCE',
+  BSC_NUM_BALANCE = 'BSC_NUM_BALANCE',
 }