🐛 (fix) login bug fixed

1.:bug: Redirect on welcome page after enter incorrect  credentials ficed.
2.:bug: FCM tokrn not found on message send fix

Author: TheAlphamerc

lib/page/homePage.dart

@@ -65,10 +65,11 @@ class _HomePageState extends State<HomePage> {
     final chatState = Provider.of<ChatState>(context, listen: false);
     final state = Provider.of<AuthState>(context, listen: false);
     chatState.databaseInit(state.userId, state.userId);
+    state.updateFCMToken();
   }
 
   Widget _body() {
-    var state = Provider.of<AppState>(context);
+    
     final authstate = Provider.of<AuthState>(context, listen: false);
     WidgetsBinding.instance.addPostFrameCallback((_) {
       var state = Provider.of<NotificationState>(context);
@@ -84,7 +85,7 @@ class _HomePageState extends State<HomePage> {
         });
       }
     });
-    return SafeArea(child: Container(child: _getPage(state.pageIndex)));
+    return SafeArea(child: Container(child: _getPage(Provider.of<AppState>(context).pageIndex)));
   }
 
   Widget _getPage(int index) {

lib/page/message/chatListPage.dart

@@ -8,6 +8,8 @@ import 'package:flutter_twitter_clone/page/common/sidebar.dart';
 import 'package:flutter_twitter_clone/page/message/newMessagePage.dart';
 import 'package:flutter_twitter_clone/state/authState.dart';
 import 'package:flutter_twitter_clone/state/chats/chatState.dart';
+import 'package:flutter_twitter_clone/state/notificationState.dart';
+import 'package:flutter_twitter_clone/state/searchState.dart';
 import 'package:flutter_twitter_clone/widgets/customAppBar.dart';
 import 'package:flutter_twitter_clone/widgets/customWidgets.dart';
 import 'package:flutter_twitter_clone/widgets/newWidget/emptyList.dart';
@@ -29,7 +31,7 @@ class _ChatListPageState extends State<ChatListPage> {
     chatState.setIsChatScreenOpen = true;
 
     // chatState.databaseInit(state.profileUserModel.userId,state.userId);
-    chatState.getUserchatList(state.userModel.userId);
+    chatState.getUserchatList(state.user.uid);
     super.initState();
   }
 
@@ -40,10 +42,11 @@ class _ChatListPageState extends State<ChatListPage> {
     if (state.chatUserList == null) {
       return Padding(
         padding: EdgeInsets.symmetric(horizontal: 30),
-        child:EmptyList(
-        'No message available ',
-        subTitle: 'When someonw sends you message,User list\'ll show up here \n  To send message tap message.',
-       )
+        child: EmptyList(
+          'No message available ',
+          subTitle:
+              'When someonw sends you message,User list\'ll show up here \n  To send message tap message.',
+        ),
       );
     } else {
       return ListView.separated(
@@ -66,7 +69,13 @@ class _ChatListPageState extends State<ChatListPage> {
         contentPadding: EdgeInsets.symmetric(horizontal: 10),
         onTap: () {
           final chatState = Provider.of<ChatState>(context, listen: false);
+          final searchState = Provider.of<SearchState>(context, listen: false);
           chatState.setChatUser = model;
+          if (searchState.userlist.any((x) => x.userId == model.userId)) {
+            chatState.setChatUser = searchState.userlist
+                .where((x) => x.userId == model.userId)
+                .first;
+          }
           Navigator.pushNamed(context, '/ChatScreenPage');
         },
         leading: RippleButton(
@@ -100,14 +109,22 @@ class _ChatListPageState extends State<ChatListPage> {
       ),
     );
   }
-  FloatingActionButton _newMessageButton(){
+
+  FloatingActionButton _newMessageButton() {
     return FloatingActionButton(
-      onPressed: (){
+      onPressed: () {
         Navigator.of(context).pushNamed('/NewMessagePage');
       },
-      child: customIcon(context,icon:AppIcon.newMessage,istwitterIcon: true, iconColor:Theme.of(context).colorScheme.onPrimary, size:25)
+      child: customIcon(
+        context,
+        icon: AppIcon.newMessage,
+        istwitterIcon: true,
+        iconColor: Theme.of(context).colorScheme.onPrimary,
+        size: 25,
+      ),
     );
   }
+
   void onSettingIconPressed() {
     Navigator.pushNamed(context, '/DirectMessagesPage');
   }

lib/state/authState.dart

@@ -45,6 +45,7 @@ class AuthState extends AppState {
     authStatus = AuthStatus.NOT_LOGGED_IN;
     userId = '';
     _userModel = null;
+    user = null;
     _profileUserModelList = null;
     if (isSignInWithGoogle) {
       _googleSignIn.signOut();
@@ -190,13 +191,8 @@ class AuthState extends AppState {
 
       // Time at which user is created
       user.createdAt = DateTime.now().toUtc().toString();
-      /// Get firebase token 
-      /// Helps to send notification
-      _firebaseMessaging.getToken().then((String token) {
-        assert(token != null);
-        user.fcmToken = token;
-      });
     }
+
     kDatabase.child('profile').child(user.userId).set(user.toJson());
     _userModel = user;
     if (_profileUserModelList != null) {
@@ -361,13 +357,7 @@ class AuthState extends AppState {
                 reloadUser();
               }
               if (_userModel.fcmToken == null) {
-                /// if firebase  token not available in frofile
-                /// Then get token from firebase and save it to profile
-                _firebaseMessaging.getToken().then((String token) {
-                  assert(token != null);
-                  _userModel.fcmToken = token;
-                  createUser(_userModel);
-                });
+                updateFCMToken();
               }
             }
 
@@ -382,6 +372,18 @@ class AuthState extends AppState {
     }
   }
 
+  /// if firebase token not available in frofile
+  /// Then get token from firebase and save it to profile
+  /// When someonw sends you a message FCM token is used
+  void updateFCMToken() {
+    getProfileUser(userProfileId: userId);
+    _firebaseMessaging.getToken().then((String token) {
+      assert(token != null);
+      _userModel.fcmToken = token;
+      createUser(_userModel);
+    });
+  }
+
   /// Follow / Unfollow user
   ///
   /// If `removeFollower` is true then remove user from follower list