Fix update price. Fix swap

hyle-team · Nov 24, 2023 · 3492c19 · 3492c19
1 parent e3ce933
commit 3492c19
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 32 deletions.
diff --git a/html_source/src/app/api/models/swap.model.ts b/html_source/src/app/api/models/swap.model.ts
@@ -2,13 +2,13 @@ export interface ProposalDetails {
     expiration_time: number;
     fee_paid_by_a: number;
     mixins: number;
-    to_alice: [
+    to_initiator: [
         {
             amount: number | string;
             asset_id: string;
         }
     ];
-    to_bob: [
+    to_finalizer: [
         {
             amount: number | string;
             asset_id: string;

diff --git a/html_source/src/app/app.component.ts b/html_source/src/app/app.component.ts
@@ -8,7 +8,7 @@ import { IntToMoneyPipe } from '@parts/pipes';
 import { BigNumber } from 'bignumber.js';
 import { ModalService } from '@parts/services/modal.service';
 import { StateKeys, Store } from '@store/store';
-import { Subject, take } from 'rxjs';
+import { shareReplay, Subject, switchMap, take } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { paths, pathsChildrenAuth } from './pages/paths';
 import { hasOwnProperty } from '@parts/functions/hasOwnProperty';
@@ -718,11 +718,12 @@ export class AppComponent implements OnInit, OnDestroy {
 
         this.variablesService.disable_price_fetch$.pipe(takeUntil(this.destroy$)).subscribe({
             next: disable_price_fetch => {
+                const updateTime = 10 * 60 * 1000;
                 if (!disable_price_fetch) {
                     this.updateMoneyEquivalent();
                     this.intervalUpdatePriceState = setInterval(() => {
                         this.updateMoneyEquivalent();
-                    }, 30000);
+                    }, updateTime);
                 } else {
                     if (this.intervalUpdatePriceState) {
                         clearInterval(this.intervalUpdatePriceState);
@@ -744,28 +745,20 @@ export class AppComponent implements OnInit, OnDestroy {
     }
 
     updateMoneyEquivalent(): void {
-        this.http
-            .get('https://api.coingecko.com/api/v3/ping')
-            .pipe(take(1))
-            .subscribe({
-                next: () => {
-                    this.http
-                        .get('https://api.coingecko.com/api/v3/simple/price?ids=zano&vs_currencies=usd&include_24hr_change=true')
-                        .pipe(take(1))
-                        .subscribe({
-                            next: data => {
-                                this.variablesService.moneyEquivalent = data['zano']['usd'];
-                                this.variablesService.moneyEquivalentPercent = data['zano']['usd_24h_change'];
-                            },
-                            error: error => {
-                                console.warn('api.coingecko.com price error: ', error);
-                            },
-                        });
-                },
-                error: error => {
-                    console.warn('api.coingecko.com error: ', error);
-                },
-            });
+        const ping$ = this.http.get('https://api.coingecko.com/api/v3/ping').pipe(shareReplay(1));
+
+        ping$.pipe(
+            switchMap(() => this.http.get('https://api.coingecko.com/api/v3/simple/price?ids=zano&vs_currencies=usd&include_24hr_change=true')),
+            take(1)
+        ).subscribe({
+            next: data => {
+                this.variablesService.moneyEquivalent = data['zano']['usd'];
+                this.variablesService.moneyEquivalentPercent = data['zano']['usd_24h_change'];
+            },
+            error: error => {
+                console.warn('api.coingecko.com price error: ', error);
+            },
+        });
     }
 
     getAliases(): void {

diff --git a/...tabs/swap/modals/swap-confirm-master-password/swap-confirm-master-password.component.html b/...tabs/swap/modals/swap-confirm-master-password/swap-confirm-master-password.component.html
@@ -12,7 +12,7 @@ <h3 class="title mb-2" fxFlex="0 0 auto">
                             {{ 'CONFIRM_SWAP.FORM.TABLE.LABELS.LABEL1' | translate }}
                         </div>
                         <div class="text">
-                            <ng-container *ngFor="let item of data.proposalDetails.to_alice">
+                            <ng-container *ngFor="let item of data.proposalDetails.to_initiator">
                                 {{ item.amount | intToMoney }}
                                 {{ (item.asset_id | getAsset)?.asset_info.ticker || '???' }}
                                 <br />
@@ -27,7 +27,7 @@ <h3 class="title mb-2" fxFlex="0 0 auto">
                             {{ 'CONFIRM_SWAP.FORM.TABLE.LABELS.LABEL2' | translate }}
                         </div>
                         <div class="text">
-                            <ng-container *ngFor="let item of data.proposalDetails.to_bob">
+                            <ng-container *ngFor="let item of data.proposalDetails.to_finalizer">
                                 {{ item.amount | intToMoney }}
                                 {{ (item.asset_id | getAsset)?.asset_info.ticker || '???' }}
                                 <br />

diff --git a/html_source/src/app/pages/wallet/tabs/swap/pages/confirm-swap/confirm-swap.component.html b/html_source/src/app/pages/wallet/tabs/swap/pages/confirm-swap/confirm-swap.component.html
@@ -22,7 +22,7 @@
                     <div class="label max-w-19-rem w-100">
                         {{ 'CONFIRM_SWAP.FORM.TABLE.LABELS.LABEL1' | translate }}
                     </div>
-                    <div *ngFor="let item of proposalDetails.to_alice" class="text">
+                    <div *ngFor="let item of proposalDetails.to_initiator" class="text">
                         {{ item.amount | intToMoney }}
                         {{ (item.asset_id | getAsset)?.asset_info.ticker || '???' }}
                     </div>
@@ -34,7 +34,7 @@
                     <div class="label max-w-19-rem w-100">
                         {{ 'CONFIRM_SWAP.FORM.TABLE.LABELS.LABEL2' | translate }}
                     </div>
-                    <div *ngFor="let item of proposalDetails.to_bob" class="text">
+                    <div *ngFor="let item of proposalDetails.to_finalizer" class="text">
                         {{ item.amount | intToMoney }}
                         {{ (item.asset_id | getAsset)?.asset_info.ticker || '???' }}
                     </div>

diff --git a/html_source/src/app/pages/wallet/tabs/swap/pages/create-swap/create-swap.component.ts b/html_source/src/app/pages/wallet/tabs/swap/pages/create-swap/create-swap.component.ts
@@ -320,13 +320,13 @@ export class CreateSwapComponent implements OnInit, OnDestroy {
             method: 'ionic_swap_generate_proposal',
             params: {
                 proposal: {
-                    to_bob: [
+                    to_finalizer: [
                         {
                             asset_id: sending.asset_id,
                             amount: this.moneyToIntPipe.transform(sending.amount),
                         },
                     ],
-                    to_alice: [
+                    to_initiator: [
                         {
                             asset_id: receiving.asset_id,
                             amount: this.moneyToIntPipe.transform(receiving.amount),