From 72f0a9a03aaf7e5d1d0427ee542422b3a94067b3 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 22 Sep 2020 18:16:43 -0300 Subject: [PATCH] fix(push-notifications): disable for hidden wallets --- src/pages/settings/wallet-settings/wallet-settings.ts | 7 ++++++- src/providers/push-notifications/push-notifications.ts | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pages/settings/wallet-settings/wallet-settings.ts b/src/pages/settings/wallet-settings/wallet-settings.ts index d7716f977ab..e08e2cbaa23 100644 --- a/src/pages/settings/wallet-settings/wallet-settings.ts +++ b/src/pages/settings/wallet-settings/wallet-settings.ts @@ -8,6 +8,7 @@ import { ConfigProvider } from '../../../providers/config/config'; import { ExternalLinkProvider } from '../../../providers/external-link/external-link'; import { KeyProvider } from '../../../providers/key/key'; import { ProfileProvider } from '../../../providers/profile/profile'; +import { PushNotificationsProvider } from '../../../providers/push-notifications/push-notifications'; import { TouchIdProvider } from '../../../providers/touchid/touchid'; import { WalletProvider } from '../../../providers/wallet/wallet'; @@ -48,7 +49,8 @@ export class WalletSettingsPage { private navParams: NavParams, private touchIdProvider: TouchIdProvider, private translate: TranslateService, - private keyProvider: KeyProvider + private keyProvider: KeyProvider, + private pushNotificationsProvider: PushNotificationsProvider ) { this.logger.info('Loaded: WalletSettingsPage'); this.wallet = this.profileProvider.getWallet(this.navParams.data.walletId); @@ -179,6 +181,9 @@ export class WalletSettingsPage { public hiddenWalletChange(walletId: string): void { if (!walletId) return; this.profileProvider.toggleHideWalletFlag(walletId); + if (!!this.wallet.hidden) + this.pushNotificationsProvider.unsubscribe(this.wallet); + else this.pushNotificationsProvider.updateSubscription(this.wallet); } public openWalletGroupDelete(): void { diff --git a/src/providers/push-notifications/push-notifications.ts b/src/providers/push-notifications/push-notifications.ts index 1c3d5a76127..18c99ef5594 100644 --- a/src/providers/push-notifications/push-notifications.ts +++ b/src/providers/push-notifications/push-notifications.ts @@ -119,7 +119,7 @@ export class PushNotificationsProvider { } const opts = { - showHidden: true + showHidden: false }; const wallets = this.profileProvider.getWallets(opts); _.forEach(wallets, walletClient => {