diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index a89febc87..785a1e371 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -69,7 +69,6 @@ export class HomePage { public showIntegration: any; private isNW: boolean; - private isWindowsPhoneApp: boolean; private updatingWalletId: object; private zone: any; @@ -99,7 +98,6 @@ export class HomePage { this.updatingWalletId = {}; this.cachedBalanceUpdateOn = ''; this.isNW = this.platformProvider.isNW; - this.isWindowsPhoneApp = this.platformProvider.isWP; this.showReorderBtc = false; this.showReorderBch = false; this.zone = new NgZone({ enableLongStackTrace: false }); @@ -197,10 +195,6 @@ export class HomePage { private checkFeedbackInfo() { this.persistenceProvider.getFeedbackInfo().then((info: any) => { - if (this.isWindowsPhoneApp) { - this.showRateCard = false; - return; - } if (!info) { this.initFeedBackInfo(); } else { diff --git a/src/pages/send/confirm/confirm.ts b/src/pages/send/confirm/confirm.ts index a15d91482..9188bc284 100644 --- a/src/pages/send/confirm/confirm.ts +++ b/src/pages/send/confirm/confirm.ts @@ -54,7 +54,6 @@ export class ConfirmPage { // Platform info public isCordova: boolean; - public isWindowsPhoneApp: boolean; // custom fee flag public usingCustomFee: boolean = false; @@ -86,7 +85,6 @@ export class ConfirmPage { this.config = this.configProvider.get(); this.configFeeLevel = this.config.wallet.settings.feeLevel ? this.config.wallet.settings.feeLevel : 'normal'; this.isCordova = this.platformProvider.isCordova; - this.isWindowsPhoneApp = this.platformProvider.isCordova && this.platformProvider.isWP; } ionViewWillEnter() { @@ -253,23 +251,11 @@ export class ConfirmPage { private setButtonText(isMultisig: boolean, isPayPro: boolean): void { if (isPayPro) { - // if (this.isCordova && !this.isWindowsPhoneApp) { - // this.buttonText = this.translate.instant('Slide to pay'); - // } else { this.buttonText = this.translate.instant('Click to pay'); - // } } 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'); - // } } else { - // if (this.isCordova && !this.isWindowsPhoneApp) { - // this.buttonText = this.translate.instant('Slide to send'); - // } else { this.buttonText = this.translate.instant('Click to send'); - // } } } diff --git a/src/pages/settings/settings.html b/src/pages/settings/settings.html index cae3ba11a..3eb4957f3 100644 --- a/src/pages/settings/settings.html +++ b/src/pages/settings/settings.html @@ -24,7 +24,7 @@ Send feedback - + Share {{ appName }} diff --git a/src/pages/settings/settings.ts b/src/pages/settings/settings.ts index f099ed4cc..51b9fabba 100644 --- a/src/pages/settings/settings.ts +++ b/src/pages/settings/settings.ts @@ -43,7 +43,6 @@ export class SettingsPage { public config: any; public selectedAlternative: any; public isCordova: boolean; - public isWindowsPhoneApp: boolean; public lockMethod: string; public exchangeServices: any[] = []; public bitpayCardEnabled: boolean = false; @@ -65,7 +64,6 @@ export class SettingsPage { this.walletsBch = []; this.walletsBtc = []; this.isCordova = this.platformProvider.isCordova; - this.isWindowsPhoneApp = this.platformProvider.isWP; } ionViewDidLoad() { diff --git a/src/pages/txp-details/txp-details.ts b/src/pages/txp-details/txp-details.ts index 88e9c8b82..41f347b06 100644 --- a/src/pages/txp-details/txp-details.ts +++ b/src/pages/txp-details/txp-details.ts @@ -42,7 +42,6 @@ export class TxpDetailsPage { private GLIDERA_LOCK_TIME: number; private countDown: any; private isCordova: boolean; - private isWindowsPhoneApp: boolean; constructor( private navParams: NavParams, @@ -70,7 +69,6 @@ export class TxpDetailsPage { this.currentSpendUnconfirmed = config.spendUnconfirmed; this.loading = false; this.isCordova = this.platformProvider.isCordova; - this.isWindowsPhoneApp = this.platformProvider.isCordova && this.platformProvider.isWP; this.copayers = this.wallet.status.wallet.copayers; this.copayerId = this.wallet.credentials.copayerId; this.isShared = this.wallet.credentials.n > 1; @@ -120,18 +118,10 @@ export class TxpDetailsPage { }).length == this.tx.requiredSignatures - 1; 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.successText = this.translate.instant('Payment Sent'); } else { - // if (this.isCordova && !this.isWindowsPhoneApp) { - // this.buttonText = this.translate.instant('Slide to accept'); - // } else { this.buttonText = this.translate.instant('Click to accept'); - // } this.successText = this.translate.instant('Payment Accepted'); } } diff --git a/src/providers/push-notifications/push-notifications.ts b/src/providers/push-notifications/push-notifications.ts index 00a911478..41399ad7c 100644 --- a/src/providers/push-notifications/push-notifications.ts +++ b/src/providers/push-notifications/push-notifications.ts @@ -39,7 +39,7 @@ export class PushNotificationsProvider { this.logger.info('PushNotificationsProvider initialized.'); this.isIOS = this.platformProvider.isIOS; this.isAndroid = this.platformProvider.isAndroid; - this.usePushNotifications = this.platformProvider.isCordova && !this.platformProvider.isWP; + this.usePushNotifications = this.platformProvider.isCordova; if (this.usePushNotifications) {