Fix DFI price in holdings wallet, Fix ARKK loan fiat value

rogi-sh · Jun 1, 2022 · eab102a · eab102a
1 parent 162ac24
commit eab102a
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "email": "[email protected]",
     "url": "https://www.defichain-income.com"
   },
-  "version": "8.22.4",
+  "version": "8.22.5",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "DefiChain-Income",
-    "version": "8.22.4"
+    "version": "8.22.5"
   },
   "build": {
     "distDir": "../dist/defichain-income",

diff --git a/src/app/pages/value/value.component.html b/src/app/pages/value/value.component.html
@@ -292,7 +292,7 @@ <h3 class='text-lg font-bold mb-2'>{{ 'holdings.wallet' | translate }} Wallet</h
             class='inline-block rounded-full bg-pink-500 hover:bg-gray-800 transition-all text-white text-sm px-2 py-1 cursor-pointer'>
             <div *ngIf='!isIncognitoModeOn'>{{wallet?.dfi | number: '1.3-3'}} ~
               <app-price *ngIf='!isIncognitoModeOn' [fiat]='fiat'
-                         [usdPrice]='wallet?.dfi * poolBtc?.priceB'></app-price>
+                         [usdPrice]='wallet?.dfi * getPool("BTC")?.priceB'></app-price>
             </div>
             <div *ngIf='isIncognitoModeOn'>****</div>
           </div>
@@ -305,7 +305,7 @@ <h3 class='text-lg font-bold mb-2'>{{ 'holdings.wallet' | translate }} Wallet</h
             class='rounded-full bg-pink-500 hover:bg-gray-800 transition-all text-white text-sm px-2 py-1 cursor-pointer inline-block text-center'>
             <div *ngIf='!isIncognitoModeOn'>{{dfiInStaking | number: '1.1-1'}} ~
               <app-price *ngIf='!isIncognitoModeOn' [fiat]='fiat'
-                         [usdPrice]='dfiInStaking * poolBtc?.priceB'></app-price>
+                         [usdPrice]='dfiInStaking * getPool("BTC")?.priceB'></app-price>
             </div>
             <div *ngIf='isIncognitoModeOn'>****</div>
           </div>
@@ -318,7 +318,7 @@ <h3 class='text-lg font-bold mb-2'>{{ 'holdings.wallet' | translate }} Wallet</h
             class='rounded-full bg-pink-500 hover:bg-gray-800 transition-all text-white text-sm px-2 py-1 cursor-pointer inline-block text-center'>
             <div *ngIf='!isIncognitoModeOn'>{{dfiInDfxStaking | number: '1.1-1'}} ~
               <app-price *ngIf='!isIncognitoModeOn' [fiat]='fiat'
-                         [usdPrice]='dfiInDfxStaking * poolBtc?.priceB'></app-price>
+                         [usdPrice]='dfiInDfxStaking * getPool("BTC")?.priceB'></app-price>
             </div>
             <div *ngIf='isIncognitoModeOn'>****</div>
           </div>
@@ -331,7 +331,7 @@ <h3 class='text-lg font-bold mb-2'>{{ 'holdings.wallet' | translate }} Wallet</h
             class='inline-block rounded-full bg-pink-500 hover:bg-gray-800 transition-all text-white text-sm px-2 py-1 cursor-pointer text-center'>
             <div *ngIf='!isIncognitoModeOn'>{{wallet?.dfiInMasternodes  | number: '1.1-1'}} ~
               <app-price *ngIf='!isIncognitoModeOn' [fiat]='fiat'
-                         [usdPrice]='wallet?.dfiInMasternodes * poolBtc?.priceB'></app-price>
+                         [usdPrice]='wallet?.dfiInMasternodes * getPool("BTC")?.priceB'></app-price>
             </div>
             <div *ngIf='isIncognitoModeOn'>****</div>
           </div>
@@ -344,7 +344,7 @@ <h3 class='text-lg font-bold mb-2'>{{ 'holdings.wallet' | translate }} Wallet</h
             class='inline-block rounded-full bg-pink-500 hover:bg-gray-800 transition-all text-white text-sm px-2 py-1 cursor-pointer text-center'>
             <div *ngIf='!isIncognitoModeOn'>{{getFreezerDfiCount() | number: '1.1-1'}} ~
               <app-price *ngIf='!isIncognitoModeOn' [fiat]='fiat'
-                         [usdPrice]='getFreezerDfiCount()  * poolBtc?.priceB'></app-price>
+                         [usdPrice]='getFreezerDfiCount()  * getPool("BTC")?.priceB'></app-price>
             </div>
             <div *ngIf='isIncognitoModeOn'>****</div>
           </div>

diff --git a/src/app/pages/value/value.component.ts b/src/app/pages/value/value.component.ts
@@ -1646,7 +1646,7 @@ export class ValueComponent implements OnInit, OnChanges {
 
     if (this.wallet?.arkkusd > 0  ) {
       this.lpTokensValues.push(new HoldingValue('ARKK-DUSD',
-        this.wallet?.arkkusd , this.wallet?.arkkusd * this.getLpTokenValue(this.getPool('Arkk'))));
+        this.wallet?.arkkusd , this.wallet?.arkkusd * this.getLpTokenValue(this.getPool('ARKK'))));
     }
 
     if (this.wallet?.babausd > 0  ) {

diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -15,7 +15,7 @@ export const environment = {
   mamon_account: 'https://sync.defichain-masternode-monitor.com/v1/KEY/masternodes',
   mamon_account_node: 'https://api.defichain-masternode-monitor.com/v1/masternodes/info/',
   burninfo: 'https://api.mydefichain.com/v1/getburninfo/',
-  version: '8.22.4',
+  version: '8.22.5',
   bittrex: 'https://api.bittrex.com/v3/currencies/DFI',
   kucoin: 'https://api.kucoin.com/api/v1/currencies/DFI',
   graphql: 'https://next.graphql.defichain-income.com/graphql',

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -19,7 +19,7 @@ export const environment = {
   mamon_account: 'https://sync.defichain-masternode-monitor.com/v1/KEY/masternodes',
   mamon_account_node: 'https://api.defichain-masternode-monitor.com/v1/masternodes/info/',
   burninfo: 'https://api.mydefichain.com/v1/getburninfo/',
-  version: '8.22.4',
+  version: '8.22.5',
   graphql: 'https://next.graphql.defichain-income.com/graphql',
   // Matomo
   // No tracking for local -> wrong id

diff --git a/src/interface/Changelog.ts b/src/interface/Changelog.ts
@@ -12,7 +12,12 @@ export class Changelog {
     this.logs = new Array<Log>();
 
     this.log = new Log();
-    this.log.version = '8.22.3 - 31.5.2022';
+    this.log.version = '8.22.5 - 31.5.2022';
+    this.log.comment = 'Fix DFI price in holdings wallet, Fix ARKK loan fiat value';
+    this.logs.push(this.log);
+
+    this.log = new Log();
+    this.log.version = '8.22.4 - 31.5.2022';
     this.log.comment = 'Fix total value with CS Pool';
     this.logs.push(this.log);