Skip to content

Commit

Permalink
Merge pull request #10862 from cmgustavo/ref/adds-coinbase-to-settings
Browse files Browse the repository at this point in the history
ref(coinbase): adds link button to settings
  • Loading branch information
matiu authored May 6, 2020
2 parents 45de7aa + f0873fc commit a398877
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
<ion-label>{{'Show on wallet tab' | translate}}</ion-label>
<ion-toggle [(ngModel)]="showInHome" (ionChange)="showInHomeSwitch()"></ion-toggle>
</ion-item>
<button ion-item (click)="goToCoinbase()">
<span translate>Connect Coinbase Account</span>
</button>
</ion-list>

<ion-list *ngIf="linkedAccount" class="bp-list">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { ConfigProvider } from '../../../../providers/config/config';
import { HomeIntegrationsProvider } from '../../../../providers/home-integrations/home-integrations';
import { PopupProvider } from '../../../../providers/popup/popup';

import { CoinbasePage } from '../coinbase';

@Component({
selector: 'page-coinbase-settings',
templateUrl: 'coinbase-settings.html'
Expand Down Expand Up @@ -64,4 +66,11 @@ export class CoinbaseSettingsPage {
}
});
}

public goToCoinbase() {
this.navCtrl.push(CoinbasePage, { animate: false }).then(() => {
const previousView = this.navCtrl.getPrevious();
this.navCtrl.removeView(previousView);
});
}
}
4 changes: 2 additions & 2 deletions src/pages/integrations/coinbase/coinbase.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<div padding text-center>
<div *ngIf="!showOauthForm" translate>Manage your Coinbase account, check balances, deposit and withdraw funds between wallets.</div>
<div *ngIf="showOauthForm" translate>If you have trouble, contact Coinbase support for direct assistance.</div>
<button margin-top *ngIf="!showOauthForm" ion-button class="button-standard" (click)="openAuthenticateWindow()">Connect Coinbase Account</button>
<button margin *ngIf="!showOauthForm" ion-button clear small color="dark" (click)="openSignupWindow()">Sign Up for Coinbase &rarr;</button>
<button margin-top *ngIf="!showOauthForm" ion-button class="button-standard" (click)="openAuthenticateWindow()" translate>Connect Coinbase Account</button>
<button margin *ngIf="!showOauthForm" ion-button clear small color="dark" (click)="openSignupWindow()" translate>Sign Up for Coinbase &rarr;</button>
</div>
<div *ngIf="showOauthForm" margin>
<form [formGroup]="oauthCodeForm" (ngSubmit)="submitOauthCode(oauthCodeForm.value.code)">
Expand Down

0 comments on commit a398877

Please sign in to comment.