Merge pull request #10760 from cmgustavo/bug/coinbase-04

fix(coinbase): finish view on iOS. Select crypto as default on amount…
bitpay · Mar 31, 2020 · c0bb33c · c0bb33c
2 parents c5c198f + f1fee49
commit c0bb33c
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 13 deletions.
diff --git a/src/pages/integrations/coinbase/coinbase-account/coinbase-account.ts b/src/pages/integrations/coinbase/coinbase-account/coinbase-account.ts
@@ -174,7 +174,7 @@ export class CoinbaseAccountPage {
           }
           this.onGoingProcessProvider.clear();
           this.navCtrl.push(AmountPage, {
-            currency: this.nativeCurrency,
+            alternativeCurrency: this.nativeCurrency,
             coin,
             walletId: fromWallet.id,
             fromWalletDetails: true,
@@ -217,7 +217,7 @@ export class CoinbaseAccountPage {
       this.navCtrl.push(AmountPage, {
         id: this.id,
         toWalletId: toWallet.id,
-        currency: this.nativeCurrency,
+        alternativeCurrency: this.nativeCurrency,
         coin,
         nextPage: 'CoinbaseWithdrawPage',
         description:

diff --git a/src/pages/integrations/coinbase/coinbase-withdraw/coinbase-withdraw.ts b/src/pages/integrations/coinbase/coinbase-withdraw/coinbase-withdraw.ts
@@ -26,6 +26,7 @@ export class CoinbaseWithdrawPage {
 
   private accountId: string;
 
+  public hideSlideButton: boolean;
   public data: object = {};
   public amount: string;
   public currency: string;
@@ -53,6 +54,7 @@ export class CoinbaseWithdrawPage {
     private walletProvider: WalletProvider
   ) {
     this.isCordova = this.platformProvider.isCordova;
+    this.hideSlideButton = false;
 
     this.amount = this.navParams.data.amount;
     this.currency = this.navParams.data.currency;
@@ -72,6 +74,16 @@ export class CoinbaseWithdrawPage {
 
   ionViewDidLoad() {
     this.logger.info('Loaded: CoinbaseWithdrawPage');
+    this.navCtrl.swipeBackEnabled = false;
+    if (this.isCordova) {
+      window.addEventListener('keyboardWillShow', () => {
+        this.hideSlideButton = true;
+      });
+
+      window.addEventListener('keyboardWillHide', () => {
+        this.hideSlideButton = false;
+      });
+    }
   }
 
   ionViewWillLeave() {
@@ -154,23 +166,27 @@ export class CoinbaseWithdrawPage {
       });
   }
 
-  private openFinishModal(): void {
-    let finishText = this.translate.instant('Withdraw success');
-    let finishComment = this.translate.instant(
+  public openFinishModal() {
+    const finishText = this.translate.instant('Withdraw success');
+    const finishComment = this.translate.instant(
       'It could take a while to confirm transaction'
     );
-    let modal = this.modalCtrl.create(
+    const modal = this.modalCtrl.create(
       FinishModalPage,
       { finishText, finishComment },
       { showBackdrop: true, enableBackdropDismiss: false }
     );
     modal.present();
     modal.onDidDismiss(_ => {
-      this.navCtrl.popToRoot().then(_ => {
+      this.navCtrl.popToRoot({ animate: false }).then(_ => {
         this.navCtrl.parent.select(1);
-        this.navCtrl.push(CoinbaseAccountPage, {
-          id: this.accountId
-        });
+        this.navCtrl.push(
+          CoinbaseAccountPage,
+          {
+            id: this.accountId
+          },
+          { animate: false }
+        );
       });
     });
   }

diff --git a/src/pages/send/amount/amount.ts b/src/pages/send/amount/amount.ts
@@ -93,6 +93,7 @@ export class AmountPage {
   public cardConfig: CardConfig;
 
   private fromCoinbase;
+  private alternativeCurrency;
 
   @ViewChild(Navbar) navBar: Navbar;
 
@@ -132,6 +133,7 @@ export class AmountPage {
       ? this.navParams.data.onlyIntegers
       : false;
     this.fromCoinbase = this.navParams.data.fromCoinbase;
+    this.alternativeCurrency = this.navParams.data.alternativeCurrency;
 
     this.showSendMax = false;
     this.useSendMax = false;
@@ -270,7 +272,10 @@ export class AmountPage {
       this.altUnitIndex = this.unitIndex;
       this.unitIndex = this.availableUnits.length;
     } else {
-      this.fiatCode = this.config.wallet.settings.alternativeIsoCode || 'USD';
+      this.fiatCode =
+        this.alternativeCurrency ||
+        this.config.wallet.settings.alternativeIsoCode ||
+        'USD';
       fiatName = this.config.wallet.settings.alternativeName || this.fiatCode;
       this.altUnitIndex = this.availableUnits.length;
     }

diff --git a/src/pages/wallets/wallets.html b/src/pages/wallets/wallets.html
@@ -119,7 +119,7 @@
         <div *ngIf="!coinbaseData.accounts" translate>Loading accounts...</div>
         <div *ngFor="let ac of coinbaseData.accounts">
           <ion-list no-lines class="bp-list" [hidden]="collapsedAccounts">
-            <button ion-item (click)="goToCoinbaseAccount(ac.id)">
+            <button ion-item detail-none (click)="goToCoinbaseAccount(ac.id)">
               <coin-icon [coin]="ac.currency.code.toLowerCase()" [network]="livenet" item-left></coin-icon>
               <ion-label>
                 {{ac.name}}

diff --git a/src/pages/wallets/wallets.ts b/src/pages/wallets/wallets.ts
@@ -142,7 +142,7 @@ export class WalletsPage {
     );
     this.coinbaseLinked = this.coinbaseProvider.isLinked();
     if (this.coinbaseLinked && this.showCoinbase) {
-      if (force || !this.coinbaseData['accounts']) {
+      if (force || !this.coinbaseData) {
         this.coinbaseProvider.updateExchangeRates();
         this.coinbaseProvider.preFetchAllData(this.coinbaseData);
       } else this.coinbaseData = this.coinbaseProvider.coinbaseData;

diff --git a/src/providers/coinbase/coinbase.ts b/src/providers/coinbase/coinbase.ts
@@ -741,6 +741,7 @@ export class CoinbaseProvider {
             this.coinbaseData['token']['access_token'],
             this.coinbaseData['token']['refresh_token']
           );
+          this.updateExchangeRates();
         }
 
         this.homeIntegrationsProvider.register({