🩹 Small fixes

shahanajparvin · Feb 6, 2022 · 607d03c · 607d03c
1 parent 833ed24
commit 607d03c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/lib/model/notificationModel.dart b/lib/model/notificationModel.dart
@@ -7,7 +7,7 @@ class NotificationModel {
   String? tweetKey;
   String? updatedAt;
   String? createdAt;
-  late String type;
+  late String? type;
   Map<String, dynamic>? data;
 
   NotificationModel({
@@ -36,5 +36,7 @@ class NotificationModel {
 extension NotificationModelHelper on NotificationModel {
   UserModel get user => UserModel.fromJson(data);
 
-  DateTime? get timeStamp => DateTime.tryParse(updatedAt ?? createdAt!);
+  DateTime? get timeStamp => updatedAt != null || createdAt != null
+      ? DateTime.tryParse(updatedAt ?? createdAt!)
+      : null;
 }
diff --git a/lib/ui/page/feed/composeTweet/composeTweet.dart b/lib/ui/page/feed/composeTweet/composeTweet.dart
@@ -144,7 +144,7 @@ class _ComposeTweetReplyPageState extends State<ComposeTweetPage> {
 
     /// Checks for username in tweet description
     /// If foud sends notification to all tagged user
-    /// If no user found or not compost tweet screen is closed and redirect back to home page.
+    /// If no user found, compose tweet screen is closed and redirect back to home page.
     await Provider.of<ComposeTweetState>(context, listen: false)
         .sendNotification(
             tweetModel, Provider.of<SearchState>(context, listen: false))

diff --git a/lib/ui/page/feed/suggestedUsers.dart b/lib/ui/page/feed/suggestedUsers.dart
@@ -71,9 +71,7 @@ class _SuggestedUsersState extends State<SuggestedUsers> {
                                 await state.followUsers();
                                 isLoading.value = false;
                               },
-                        label: state.selectedusersCount < 5
-                            ? '${5 - state.selectedusersCount} more to follow'
-                            : 'Follow ${state.selectedusersCount}',
+                        label: 'Follow ${state.selectedusersCount}',
                         isWraped: true,
                         borderRadius: 50,
                         labelStyle: TextStyles.onPrimaryTitleText,

diff --git a/lib/ui/page/homePage.dart b/lib/ui/page/homePage.dart
@@ -210,7 +210,8 @@ class _HomePageState extends State<HomePage> {
     final state = context.watch<AuthState>();
     context.read<SuggestionsState>().initUser(state.userModel);
 
-    if (context.watch<SuggestionsState>().displaySuggestions) {
+    if (context
+        .select<SuggestionsState, bool>((state) => state.displaySuggestions)) {
       return SuggestedUsers();
     }