Merge pull request #11152 from cmgustavo/bug/push-notif-for-hidden-wa…

…llets-01 fix(push-notifications): disabled for hidden wallets
bitpay · Sep 23, 2020 · 71deb9b · 71deb9b
2 parents 84aac8d + 72f0a9a
commit 71deb9b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -119,7 +119,7 @@ export class PushNotificationsProvider {
     }
 
     const opts = {
-      showHidden: true
+      showHidden: false
     };
     const wallets = this.profileProvider.getWallets(opts);
     _.forEach(wallets, walletClient => {