BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

resolves #8086

This commit is contained in:
Darren Nelsen 2018-02-21 11:12:23 -05:00
parent eb121c5058
commit df60ec7acc
6 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/home/home.ts
View File

@ -69,7 +69,6 @@ export class HomePage {
public showIntegration: any; public showIntegration: any;
private isNW: boolean; private isNW: boolean;
private isWindowsPhoneApp: boolean;
private updatingWalletId: object; private updatingWalletId: object;
private zone: any; private zone: any;
@ -99,7 +98,6 @@ export class HomePage {
this.updatingWalletId = {}; this.updatingWalletId = {};
this.cachedBalanceUpdateOn = ''; this.cachedBalanceUpdateOn = '';
this.isNW = this.platformProvider.isNW; this.isNW = this.platformProvider.isNW;
this.isWindowsPhoneApp = this.platformProvider.isWP;
this.showReorderBtc = false; this.showReorderBtc = false;
this.showReorderBch = false; this.showReorderBch = false;
this.zone = new NgZone({ enableLongStackTrace: false }); this.zone = new NgZone({ enableLongStackTrace: false });
@ -197,10 +195,6 @@ export class HomePage {
private checkFeedbackInfo() { private checkFeedbackInfo() {
this.persistenceProvider.getFeedbackInfo().then((info: any) => { this.persistenceProvider.getFeedbackInfo().then((info: any) => {
if (this.isWindowsPhoneApp) {
this.showRateCard = false;
return;
}
if (!info) { if (!info) {
this.initFeedBackInfo(); this.initFeedBackInfo();
} else { } else {

14
src/pages/send/confirm/confirm.ts
View File

@ -54,7 +54,6 @@ export class ConfirmPage {
// Platform info // Platform info
public isCordova: boolean; public isCordova: boolean;
public isWindowsPhoneApp: boolean;
// custom fee flag // custom fee flag
public usingCustomFee: boolean = false; public usingCustomFee: boolean = false;
@ -86,7 +85,6 @@ export class ConfirmPage {
this.config = this.configProvider.get(); this.config = this.configProvider.get();
this.configFeeLevel = this.config.wallet.settings.feeLevel ? this.config.wallet.settings.feeLevel : 'normal'; this.configFeeLevel = this.config.wallet.settings.feeLevel ? this.config.wallet.settings.feeLevel : 'normal';
this.isCordova = this.platformProvider.isCordova; this.isCordova = this.platformProvider.isCordova;
this.isWindowsPhoneApp = this.platformProvider.isCordova && this.platformProvider.isWP;
} }
ionViewWillEnter() { ionViewWillEnter() {
@ -253,23 +251,11 @@ export class ConfirmPage {
private setButtonText(isMultisig: boolean, isPayPro: boolean): void { private setButtonText(isMultisig: boolean, isPayPro: boolean): void {
if (isPayPro) { if (isPayPro) {
// if (this.isCordova && !this.isWindowsPhoneApp) {
// this.buttonText = this.translate.instant('Slide to pay');
// } else {
this.buttonText = this.translate.instant('Click to pay'); this.buttonText = this.translate.instant('Click to pay');
// }
} else if (isMultisig) { } else if (isMultisig) {
// if (this.isCordova && !this.isWindowsPhoneApp) {
// this.buttonText = this.translate.instant('Slide to accept');
// } else {
this.buttonText = this.translate.instant('Click to accept'); this.buttonText = this.translate.instant('Click to accept');
// }
} else { } else {
// if (this.isCordova && !this.isWindowsPhoneApp) {
// this.buttonText = this.translate.instant('Slide to send');
// } else {
this.buttonText = this.translate.instant('Click to send'); this.buttonText = this.translate.instant('Click to send');
// }
} }
} }

2
src/pages/settings/settings.html
View File

@ -24,7 +24,7 @@
Send feedback Send feedback
</ion-item> </ion-item>
<ion-item *ngIf="isCordova && !isWindowsPhoneApp" (click)="openFeedbackCompletePage()"> <ion-item *ngIf="isCordova" (click)="openFeedbackCompletePage()">
<ion-icon name="ios-heart-outline" item-start></ion-icon> <ion-icon name="ios-heart-outline" item-start></ion-icon>
Share {{ appName }} Share {{ appName }}
</ion-item> </ion-item>

2
src/pages/settings/settings.ts
View File

@ -43,7 +43,6 @@ export class SettingsPage {
public config: any; public config: any;
public selectedAlternative: any; public selectedAlternative: any;
public isCordova: boolean; public isCordova: boolean;
public isWindowsPhoneApp: boolean;
public lockMethod: string; public lockMethod: string;
public exchangeServices: any[] = []; public exchangeServices: any[] = [];
public bitpayCardEnabled: boolean = false; public bitpayCardEnabled: boolean = false;
@ -65,7 +64,6 @@ export class SettingsPage {
this.walletsBch = []; this.walletsBch = [];
this.walletsBtc = []; this.walletsBtc = [];
this.isCordova = this.platformProvider.isCordova; this.isCordova = this.platformProvider.isCordova;
this.isWindowsPhoneApp = this.platformProvider.isWP;
} }
ionViewDidLoad() { ionViewDidLoad() {

10
src/pages/txp-details/txp-details.ts
View File

@ -42,7 +42,6 @@ export class TxpDetailsPage {
private GLIDERA_LOCK_TIME: number; private GLIDERA_LOCK_TIME: number;
private countDown: any; private countDown: any;
private isCordova: boolean; private isCordova: boolean;
private isWindowsPhoneApp: boolean;
constructor( constructor(
private navParams: NavParams, private navParams: NavParams,
@ -70,7 +69,6 @@ export class TxpDetailsPage {
this.currentSpendUnconfirmed = config.spendUnconfirmed; this.currentSpendUnconfirmed = config.spendUnconfirmed;
this.loading = false; this.loading = false;
this.isCordova = this.platformProvider.isCordova; this.isCordova = this.platformProvider.isCordova;
this.isWindowsPhoneApp = this.platformProvider.isCordova && this.platformProvider.isWP;
this.copayers = this.wallet.status.wallet.copayers; this.copayers = this.wallet.status.wallet.copayers;
this.copayerId = this.wallet.credentials.copayerId; this.copayerId = this.wallet.credentials.copayerId;
this.isShared = this.wallet.credentials.n > 1; this.isShared = this.wallet.credentials.n > 1;
@ -120,18 +118,10 @@ export class TxpDetailsPage {
}).length == this.tx.requiredSignatures - 1; }).length == this.tx.requiredSignatures - 1;
if (lastSigner) { if (lastSigner) {
// if (this.isCordova && !this.isWindowsPhoneApp) {
// this.buttonText = this.translate.instant('Slide to send');
// } else {
this.buttonText = this.translate.instant('Click to send'); this.buttonText = this.translate.instant('Click to send');
// }
this.successText = this.translate.instant('Payment Sent'); this.successText = this.translate.instant('Payment Sent');
} else { } else {
// if (this.isCordova && !this.isWindowsPhoneApp) {
// this.buttonText = this.translate.instant('Slide to accept');
// } else {
this.buttonText = this.translate.instant('Click to accept'); this.buttonText = this.translate.instant('Click to accept');
// }
this.successText = this.translate.instant('Payment Accepted'); this.successText = this.translate.instant('Payment Accepted');
} }
} }

2
src/providers/push-notifications/push-notifications.ts
View File

@ -39,7 +39,7 @@ export class PushNotificationsProvider {
this.logger.info('PushNotificationsProvider initialized.'); this.logger.info('PushNotificationsProvider initialized.');
this.isIOS = this.platformProvider.isIOS; this.isIOS = this.platformProvider.isIOS;
this.isAndroid = this.platformProvider.isAndroid; this.isAndroid = this.platformProvider.isAndroid;
this.usePushNotifications = this.platformProvider.isCordova && !this.platformProvider.isWP; this.usePushNotifications = this.platformProvider.isCordova;
if (this.usePushNotifications) { if (this.usePushNotifications) {