From 7da9b062406c735ecb4a21d1c31a7b4b0c664e9a Mon Sep 17 00:00:00 2001
From: Mohammed Mohsin <mdmohsin_1@hotmail.com>
Date: Fri, 8 Aug 2025 11:36:12 +0530
Subject: [PATCH 1/2] save token after firebase auth is ready and signed in

---
 app/lib/main.dart | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/lib/main.dart b/app/lib/main.dart
index d1eaea84a70..38e80939519 100644
--- a/app/lib/main.dart
+++ b/app/lib/main.dart
@@ -370,9 +370,6 @@ class _DeciderWidgetState extends State<DeciderWidget> {
     initDeepLinks();
 
     WidgetsBinding.instance.addPostFrameCallback((_) async {
-      if (context.read<ConnectivityProvider>().isConnected) {
-        NotificationService.instance.saveNotificationToken();
-      }
 
       if (context.read<AuthenticationProvider>().isSignedIn()) {
         context.read<HomeProvider>().setupHasSpeakerProfile();
@@ -389,6 +386,8 @@ class _DeciderWidgetState extends State<DeciderWidget> {
         context.read<AppProvider>().setAppsFromCache();
         context.read<MessageProvider>().refreshMessages();
         context.read<UsageProvider>().fetchSubscription();
+
+        NotificationService.instance.saveNotificationToken();
       } else {
         if (!PlatformManager.instance.isAnalyticsSupported) {
           await PlatformManager.instance.intercom.loginUnidentifiedUser();

From 75785f392885cdb74c7ba9c9388c57ba2605db3f Mon Sep 17 00:00:00 2001
From: Mohammed Mohsin <mdmohsin_1@hotmail.com>
Date: Fri, 8 Aug 2025 11:36:40 +0530
Subject: [PATCH 2/2] save token on home screen (for already signed in users)

---
 app/lib/pages/home/page.dart | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/lib/pages/home/page.dart b/app/lib/pages/home/page.dart
index 4b11c35f22c..2c95c0b25af 100644
--- a/app/lib/pages/home/page.dart
+++ b/app/lib/pages/home/page.dart
@@ -4,28 +4,22 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_foreground_task/flutter_foreground_task.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 import 'package:omi/backend/http/api/users.dart';
 import 'package:omi/backend/preferences.dart';
 import 'package:omi/backend/schema/app.dart';
 import 'package:omi/backend/schema/geolocation.dart';
-import 'package:omi/gen/assets.gen.dart';
 import 'package:omi/main.dart';
 import 'package:omi/pages/action_items/action_items_page.dart';
 import 'package:omi/pages/apps/page.dart';
-import 'package:omi/pages/chat/sessions_history_page.dart';
 import 'package:omi/pages/chat/page.dart';
 import 'package:omi/pages/conversations/conversations_page.dart';
-import 'package:omi/pages/home/widgets/chat_apps_dropdown_widget.dart';
 import 'package:omi/pages/memories/page.dart';
 import 'package:omi/pages/settings/data_privacy_page.dart';
-import 'package:omi/pages/settings/page.dart';
 import 'package:omi/pages/settings/settings_drawer.dart';
 import 'package:omi/providers/app_provider.dart';
 import 'package:omi/providers/capture_provider.dart';
-import 'package:omi/providers/chat_session_provider.dart';
 import 'package:omi/providers/connectivity_provider.dart';
 import 'package:omi/providers/conversation_provider.dart';
 import 'package:omi/providers/device_provider.dart';
@@ -70,6 +64,7 @@ class _HomePageWrapperState extends State<HomePageWrapper> {
       }
       if (SharedPreferencesUtil().notificationsEnabled) {
         NotificationService.instance.register();
+         NotificationService.instance.saveNotificationToken();
       }
       if (SharedPreferencesUtil().locationEnabled != await Permission.location.isGranted) {
         SharedPreferencesUtil().locationEnabled = await Permission.location.isGranted;