From 92915f05ad19db9901509f34a8ce315cf1105274 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Mon, 11 Dec 2023 15:01:48 -0500 Subject: [PATCH] moved where web subscription local storage is read to be more consistent with how the snackbar is managed for mobile --- lib/pages/chat_list/chat_list.dart | 10 ---------- lib/pangea/controllers/subscription_controller.dart | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index 05d5e276e..662de6b01 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -8,7 +8,6 @@ import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat_list/chat_list_view.dart'; import 'package:fluffychat/pages/settings_security/settings_security.dart'; -import 'package:fluffychat/pangea/constants/local.key.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/pangea/utils/add_to_space.dart'; @@ -758,15 +757,6 @@ class ChatListController extends State await pangeaController.subscriptionController.initialize(); pangeaController.afterSyncAndFirstLoginInitialization(context); await pangeaController.inviteBotToExistingSpaces(); - final bool? beganWebPayment = pangeaController.pStoreService.read( - PLocalKey.beganWebPayment, - ); - if (beganWebPayment ?? false) { - pangeaController.pStoreService.delete(PLocalKey.beganWebPayment); - if (pangeaController.subscriptionController.isSubscribed) { - showSubscribedSnackbar(context); - } - } } else { ErrorHandler.logError( m: "didn't run afterSyncAndFirstLoginInitialization because not mounted", diff --git a/lib/pangea/controllers/subscription_controller.dart b/lib/pangea/controllers/subscription_controller.dart index 85bc6e30e..f8e932865 100644 --- a/lib/pangea/controllers/subscription_controller.dart +++ b/lib/pangea/controllers/subscription_controller.dart @@ -75,6 +75,16 @@ class SubscriptionController extends BaseController { } }, ); + } else { + final bool? beganWebPayment = _pangeaController.pStoreService.read( + PLocalKey.beganWebPayment, + ); + if (beganWebPayment ?? false) { + _pangeaController.pStoreService.delete(PLocalKey.beganWebPayment); + if (_pangeaController.subscriptionController.isSubscribed) { + subscriptionStream.add(true); + } + } } setState(); } catch (e, s) {