NEW: Mzansi Directory Provider Setup

Frontend/lib/main.dart

@@ -8,6 +8,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calculato
 import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_calendar_provider.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_mine_sweeper_provider.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_ai_provider.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_wallet_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
@@ -91,6 +92,9 @@ class _MzansiInnovationHubState extends State<MzansiInnovationHub> {
         ChangeNotifierProvider(
           create: (context) => MzansiAiProvider(),
         ),
+        ChangeNotifierProvider(
+          create: (context) => MzansiDirectoryProvider(),
+        ),
         ChangeNotifierProvider(
           create: (context) => MihBannerAdProvider(),
         ),

Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart

@@ -396,7 +396,6 @@ class _PackageToolOneState extends State<PackageToolOne> {
                         return widget.business != null
                             ? MihBusinessProfilePreview(
                                 business: widget.business!,
-                                myLocation: myLocation,
                               )
                             : Text("NoBusiness Data");
                       }
@@ -424,7 +423,7 @@ class _PackageToolOneState extends State<PackageToolOne> {
                     "rating",
                     "mission_vision",
                   ),
-                  startUpSearch: '',
+                  // startUpSearch: '',
                   width: 300,
                 ).redacted(
                   context: context,

Frontend/lib/mih_components/mih_package_components/mih_business_profile_preview.dart

@@ -4,17 +4,17 @@ import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_location_services.dart';
+import 'package:provider/provider.dart';
 
 class MihBusinessProfilePreview extends StatefulWidget {
   final Business business;
-  final String? myLocation;
   const MihBusinessProfilePreview({
     super.key,
     required this.business,
-    required this.myLocation,
   });
 
   @override
@@ -26,10 +26,10 @@ class _MihBusinessProfilePreviewState extends State<MihBusinessProfilePreview> {
   late Future<String> futureImageUrl;
   PlatformFile? file;
 
-  String calculateDistance() {
+  String calculateDistance(MzansiDirectoryProvider directoryProvider) {
     try {
       double distanceInKm = MIHLocationAPI().getDistanceInMeaters(
-              widget.myLocation!, widget.business.gps_location) /
+              directoryProvider.userLocation, widget.business.gps_location) /
           1000;
       return "${distanceInKm.toStringAsFixed(2)} km";
     } catch (error) {
@@ -48,6 +48,9 @@ class _MihBusinessProfilePreviewState extends State<MihBusinessProfilePreview> {
   @override
   Widget build(BuildContext context) {
     double profilePictureWidth = 60;
+    return Consumer<MzansiDirectoryProvider>(
+      builder: (BuildContext context, MzansiDirectoryProvider directoryProvider,
+          Widget? child) {
         return Row(
           children: [
             FutureBuilder(
@@ -63,9 +66,11 @@ class _MihBusinessProfilePreviewState extends State<MihBusinessProfilePreview> {
                         fileNameController: TextEditingController(),
                         userSelectedfile: file,
                         frameColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         backgroundColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         onChange: () {},
                       );
                     } else {
@@ -73,7 +78,8 @@ class _MihBusinessProfilePreviewState extends State<MihBusinessProfilePreview> {
                         MihIcons.iDontKnow,
                         size: profilePictureWidth,
                         color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                       );
                     }
                   } else {
@@ -81,7 +87,8 @@ class _MihBusinessProfilePreviewState extends State<MihBusinessProfilePreview> {
                       MihIcons.mihRing,
                       size: profilePictureWidth,
                       color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                     );
                   }
                 }),
@@ -104,8 +111,8 @@ class _MihBusinessProfilePreviewState extends State<MihBusinessProfilePreview> {
                   ),
                 ),
                 Text(
-              widget.myLocation != null || widget.myLocation!.isEmpty
+                  directoryProvider.userPosition != null
-                  ? calculateDistance()
+                      ? calculateDistance(directoryProvider)
                       : "0.00 km",
                   style: TextStyle(
                     fontWeight: FontWeight.bold,
@@ -116,5 +123,7 @@ class _MihBusinessProfilePreviewState extends State<MihBusinessProfilePreview> {
             )
           ],
         );
+      },
+    );
   }
 }

Frontend/lib/mih_components/mih_providers/mzansi_directory_provider.dart

@@ -0,0 +1,84 @@
+import 'package:flutter/material.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_objects/bookmarked_business.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
+
+class MzansiDirectoryProvider extends ChangeNotifier {
+  int toolIndex;
+  Position? userPosition;
+  String userLocation;
+  bool personalSearch;
+  List<BookmarkedBusiness> bookmarkedBusinesses = [];
+  Map<String, Business?> businessDetailsMap = {};
+  List<Business>? searchedBusinesses;
+  Business? selectedBusiness;
+  List<AppUser>? searchedUsers;
+  AppUser? selectedUser;
+  String searchTerm;
+  String businessTypeFilter;
+
+  MzansiDirectoryProvider({
+    this.toolIndex = 0,
+    this.personalSearch = true,
+    this.userLocation = "Unknown Location",
+    this.searchTerm = "",
+    this.businessTypeFilter = "",
+  });
+
+  void setToolIndex(int index) {
+    toolIndex = index;
+    notifyListeners();
+  }
+
+  void setUserPosition(Position? position) {
+    userPosition = position;
+    userLocation = "${position?.latitude}, ${position?.longitude}";
+    notifyListeners();
+  }
+
+  void setPersonalSearch(bool personal) {
+    personalSearch = personal;
+    notifyListeners();
+  }
+
+  void setFavouriteBusinesses({required List<BookmarkedBusiness> businesses}) {
+    bookmarkedBusinesses = businesses;
+    notifyListeners();
+  }
+
+  void setBusinessDetailsMap({required Map<String, Business?> detailsMap}) {
+    businessDetailsMap = detailsMap;
+    notifyListeners();
+  }
+
+  void setSearchedBusinesses({required List<Business> searchedBusinesses}) {
+    this.searchedBusinesses = searchedBusinesses;
+    notifyListeners();
+  }
+
+  void setSelectedBusiness({required Business business}) {
+    selectedBusiness = business;
+    notifyListeners();
+  }
+
+  void setSearchedUsers({required List<AppUser> searchedUsers}) {
+    this.searchedUsers = searchedUsers;
+    notifyListeners();
+  }
+
+  void setSelectedUser({required AppUser user}) {
+    selectedUser = user;
+    notifyListeners();
+  }
+
+  void setSearchTerm({required String searchTerm}) {
+    this.searchTerm = searchTerm;
+    notifyListeners();
+  }
+
+  void setBusinessTypeFilter({required String businessTypeFilter}) {
+    this.businessTypeFilter = businessTypeFilter;
+    notifyListeners();
+  }
+}

Frontend/lib/mih_config/mih_go_router.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_print_prevew.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/Example/package_test.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_packages/about_mih/about_mih.dart';
 import 'package:mzansi_innovation_hub/mih_packages/access_review/mih_access.dart';
@@ -169,14 +169,15 @@ class MihGoRouter {
         path: MihGoRouterPaths.mzansiProfileView,
         builder: (BuildContext context, GoRouterState state) {
           KenLogger.success("MihGoRouter: mzansiProfileView");
-          final AppUser? user = state.extra as AppUser?;
+          MzansiDirectoryProvider directoryProvider =
-          if (user == null) {
+              context.read<MzansiDirectoryProvider>();
+          if (directoryProvider.selectedUser == null) {
             WidgetsBinding.instance.addPostFrameCallback((_) {
               context.go(MihGoRouterPaths.mihHome);
             });
             return const SizedBox.shrink();
           }
-          return MzansiProfileView(user: user);
+          return MzansiProfileView();
         },
       ),
       // ========================== Mzansi Profile Business ==================================
@@ -203,9 +204,10 @@ class MihGoRouter {
           KenLogger.success("MihGoRouter: businessProfileView");
           String? businessId = state.uri.queryParameters['business_id'];
           KenLogger.success("businessId: $businessId");
-          final BusinessViewArguments? args =
+          MzansiDirectoryProvider directoryProvider =
-              state.extra as BusinessViewArguments?;
+              context.read<MzansiDirectoryProvider>();
-          if (args == null && businessId == null) {
+          if (directoryProvider.selectedBusiness == null &&
+              businessId == null) {
             WidgetsBinding.instance.addPostFrameCallback((_) {
               context.go(MihGoRouterPaths.mihHome);
             });
@@ -213,7 +215,6 @@ class MihGoRouter {
           }
           return MzansiBusinessProfileView(
             key: UniqueKey(),
-            arguments: args,
             businessId: businessId,
           );
         },
@@ -406,15 +407,13 @@ class MihGoRouter {
         name: "mzansiDirectory",
         path: MihGoRouterPaths.mzansiDirectory,
         builder: (BuildContext context, GoRouterState state) {
-          final MzansiDirectoryArguments? args =
+          if (context.watch<MzansiProfileProvider>().business == null) {
-              state.extra as MzansiDirectoryArguments?;
-          if (args == null) {
             WidgetsBinding.instance.addPostFrameCallback((_) {
               context.go(MihGoRouterPaths.mihHome);
             });
             return const SizedBox.shrink();
           }
-          return MzansiDirectory(arguments: args);
+          return MzansiDirectory();
         },
       ),
       // ========================== End ==================================

Frontend/lib/mih_packages/access_review/builder/build_business_access_list.dart

@@ -2,7 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:ken_logger/ken_logger.dart';
 import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_objects/patient_access.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_access_controlls_provider.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_access_controls_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
@@ -10,18 +13,15 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_warning_message.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
+import 'package:provider/provider.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/patient_access.dart';
 
 class BuildBusinessAccessList extends StatefulWidget {
-  final List<PatientAccess> patientAccessList;
+  final String filterText;
-  final AppUser signedInUser;
   final void Function()? onSuccessUpate;
 
   const BuildBusinessAccessList({
     super.key,
-    required this.patientAccessList,
+    required this.filterText,
-    required this.signedInUser,
     required this.onSuccessUpate,
   });
 
@@ -60,18 +60,20 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
     );
   }
 
-  Widget displayQueue(int index) {
+  Widget displayQueue(
-    String line1 =
+      MzansiProfileProvider mzansiProfileProvider,
-        "Business Name: ${widget.patientAccessList[index].requested_by}";
+      MihAccessControllsProvider accessProvider,
+      int index,
+      List<PatientAccess> filteredList) {
+    String line1 = "Business Name: ${filteredList[index].requested_by}";
     String line2 = "";
 
     line2 +=
-        "Request Date: ${widget.patientAccessList[index].requested_on.substring(0, 16).replaceAll("T", " ")}\n";
+        "Request Date: ${filteredList[index].requested_on.substring(0, 16).replaceAll("T", " ")}\n";
-    line2 +=
+    line2 += "Profile Type: ${filteredList[index].type.toUpperCase()}\n";
-        "Profile Type: ${widget.patientAccessList[index].type.toUpperCase()}\n";
     //subtitle += "Business Type: ${widget.patientAccessList[index].type}\n";
     String line3 = "Status: ";
-    String access = widget.patientAccessList[index].status.toUpperCase();
+    String access = filteredList[index].status.toUpperCase();
 
     TextSpan accessWithColour;
     if (access == "APPROVED") {
@@ -118,7 +120,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
       //   ),
       // ),
       onTap: () {
-        viewApprovalPopUp(index);
+        viewApprovalPopUp(mzansiProfileProvider, accessProvider, index);
       },
       // trailing: Icon(
       //   Icons.arrow_forward,
@@ -153,23 +155,24 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
     }
   }
 
-  void viewApprovalPopUp(int index) {
+  void viewApprovalPopUp(MzansiProfileProvider mzansiProfileProvider,
+      MihAccessControllsProvider accessProvider, int index) {
     String subtitle =
-        "Business Name: ${widget.patientAccessList[index].requested_by}\n";
+        "Business Name: ${accessProvider.accessList![index].requested_by}\n";
     subtitle +=
-        "Requested Date: ${widget.patientAccessList[index].requested_on.substring(0, 16).replaceAll("T", " ")}\n";
+        "Requested Date: ${accessProvider.accessList![index].requested_on.substring(0, 16).replaceAll("T", " ")}\n";
 
     subtitle +=
-        "Profile Type: ${widget.patientAccessList[index].type.toUpperCase()}\n";
+        "Profile Type: ${accessProvider.accessList![index].type.toUpperCase()}\n";
     subtitle +=
-        "Status: ${widget.patientAccessList[index].status.toUpperCase()}";
+        "Status: ${accessProvider.accessList![index].status.toUpperCase()}";
-    if (widget.patientAccessList[index].status == 'pending') {
+    if (accessProvider.accessList![index].status == 'pending') {
       //     "\nYou are about to approve an access request to your patient profile.\nPlease be aware that once approved, ${widget.patientAccessList[index].requested_by} will have access to your profile forever and will be able to contribute to it.\nIf you are unsure about an upcoming appointment with ${widget.patientAccessList[index].requested_by}, please contact *Add Number here* for clarification before approving this request.";
     } else {
       subtitle +=
-          "\nActioned By: ${widget.patientAccessList[index].approved_by}\n";
+          "\nActioned By: ${accessProvider.accessList![index].approved_by}\n";
       subtitle +=
-          "Actioned On: ${widget.patientAccessList[index].approved_on.substring(0, 16).replaceAll("T", " ")}";
+          "Actioned On: ${accessProvider.accessList![index].approved_on.substring(0, 16).replaceAll("T", " ")}";
       // subtitle +=
       //     "You have approved this access request to your patient profile.\nPlease be aware that once approved, ${widget.patientAccessList[index].requested_by} will have access to your profile forever and will be able to contribute to it.";
     }
@@ -199,7 +202,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
               ),
               const SizedBox(height: 20.0),
               Visibility(
-                visible: widget.patientAccessList[index].status == 'pending',
+                visible: accessProvider.accessList![index].status == 'pending',
                 child: Column(
                   mainAxisSize: MainAxisSize.max,
                   mainAxisAlignment: MainAxisAlignment.start,
@@ -271,7 +274,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                 ),
               ),
               Visibility(
-                visible: widget.patientAccessList[index].status == 'approved',
+                visible: accessProvider.accessList![index].status == 'approved',
                 child: Column(
                   mainAxisSize: MainAxisSize.max,
                   mainAxisAlignment: MainAxisAlignment.start,
@@ -338,7 +341,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                 height: 20,
               ),
               Visibility(
-                visible: widget.patientAccessList[index].status == 'pending',
+                visible: accessProvider.accessList![index].status == 'pending',
                 child: Wrap(
                   runSpacing: 10,
                   spacing: 10,
@@ -348,15 +351,20 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         print("request declined");
                         int statusCode = await MihAccessControlsServices()
                             .updatePatientAccessAPICall(
-                          widget.patientAccessList[index].business_id,
+                          accessProvider.accessList![index].business_id,
-                          widget.patientAccessList[index].requested_by,
+                          accessProvider.accessList![index].requested_by,
-                          widget.patientAccessList[index].app_id,
+                          accessProvider.accessList![index].app_id,
                           "declined",
-                          "${widget.signedInUser.fname} ${widget.signedInUser.lname}",
+                          "${mzansiProfileProvider.user!.fname} ${mzansiProfileProvider.user!.lname}",
-                          widget.signedInUser,
+                          mzansiProfileProvider.user!,
                           context,
                         );
                         if (statusCode == 200) {
+                          await MihAccessControlsServices()
+                              .getBusinessAccessListOfPatient(
+                            mzansiProfileProvider.user!.app_id,
+                            accessProvider,
+                          );
                           context.pop();
                           successPopUp("Successfully Actioned Request",
                               "You have successfully Declined access request");
@@ -384,15 +392,20 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         print("request approved");
                         int statusCode = await MihAccessControlsServices()
                             .updatePatientAccessAPICall(
-                          widget.patientAccessList[index].business_id,
+                          accessProvider.accessList![index].business_id,
-                          widget.patientAccessList[index].requested_by,
+                          accessProvider.accessList![index].requested_by,
-                          widget.patientAccessList[index].app_id,
+                          accessProvider.accessList![index].app_id,
                           "approved",
-                          "${widget.signedInUser.fname} ${widget.signedInUser.lname}",
+                          "${mzansiProfileProvider.user!.fname} ${mzansiProfileProvider.user!.lname}",
-                          widget.signedInUser,
+                          mzansiProfileProvider.user!,
                           context,
                         );
                         if (statusCode == 200) {
+                          await MihAccessControlsServices()
+                              .getBusinessAccessListOfPatient(
+                            mzansiProfileProvider.user!.app_id,
+                            accessProvider,
+                          );
                           context.pop();
                           successPopUp("Successfully Actioned Request",
                               "You have successfully Accepted access request");
@@ -487,6 +500,16 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
     );
   }
 
+  List<PatientAccess> filterAccessList(List<PatientAccess> accessList) {
+    if (widget.filterText == "All") {
+      return accessList;
+    }
+    return accessList
+        .where((item) =>
+            item.status.toLowerCase() == widget.filterText.toLowerCase())
+        .toList();
+  }
+
   @override
   void dispose() {
     super.dispose();
@@ -500,6 +523,11 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
       height = size.height;
     });
     checkScreenSize();
+    return Consumer2<MzansiProfileProvider, MihAccessControllsProvider>(
+      builder: (BuildContext context,
+          MzansiProfileProvider mzansiProfileProvider,
+          MihAccessControllsProvider accessProvider,
+          Widget? child) {
         return ListView.separated(
           shrinkWrap: true,
           physics: const NeverScrollableScrollPhysics(),
@@ -509,11 +537,15 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                   MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
             );
           },
-      itemCount: widget.patientAccessList.length,
+          itemCount: filterAccessList(accessProvider.accessList!).length,
           itemBuilder: (context, index) {
             //final patient = widget.patients[index].id_no.contains(widget.searchString);
             //print(index);
-        return displayQueue(index);
+            final filteredList = filterAccessList(accessProvider.accessList!);
+            return displayQueue(
+                mzansiProfileProvider, accessProvider, index, filteredList);
+          },
+        );
       },
     );
   }

Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart

@@ -105,7 +105,6 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
     temp.add({
       "Mzansi Directory": MzansiDirectoryTile(
         packageSize: packageSize,
-        personalSelected: false,
       )
     });
     //=============== Calculator ===============

Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart

@@ -118,7 +118,6 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
     temp.add({
       "Mzansi Directory": MzansiDirectoryTile(
         packageSize: packageSize,
-        personalSelected: true,
       )
     });
     //=============== Calendar ===============

Frontend/lib/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart

@@ -1,20 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_business_profile_preview.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
+import 'package:provider/provider.dart';
 
 class BuildBusinessSearchResultsList extends StatefulWidget {
   final List<Business> businessList;
-  final String myLocation;
-  final String? startUpSearch;
   const BuildBusinessSearchResultsList({
     super.key,
     required this.businessList,
-    required this.myLocation,
-    required this.startUpSearch,
   });
 
   @override
@@ -26,6 +23,9 @@ class _BuildBusinessSearchResultsListState
     extends State<BuildBusinessSearchResultsList> {
   @override
   Widget build(BuildContext context) {
+    return Consumer<MzansiDirectoryProvider>(
+      builder: (BuildContext context, MzansiDirectoryProvider directoryProvider,
+          Widget? child) {
         return ListView.separated(
           shrinkWrap: true,
           physics: const NeverScrollableScrollPhysics(),
@@ -42,20 +42,12 @@ class _BuildBusinessSearchResultsListState
                   MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               child: InkWell(
                 onTap: () {
-              context.goNamed(
+                  directoryProvider.setSelectedBusiness(
-                'businessProfileView',
+                    business: widget.businessList[index],
-                extra: BusinessViewArguments(
+                  );
-                  widget.businessList[index],
+                  context.pushNamed(
-                  widget.businessList[index].Name,
+                    'businessProfileView',
-                ),
                   );
-              // // Navigator.of(context).pushNamed(
-              // //   '/business-profile/view',
-              // //   arguments: BusinessViewArguments(
-              // //     widget.businessList[index],
-              // //     widget.businessList[index].Name,
-              // //   ),
-              // );
                 },
                 splashColor: MihColors.getSecondaryColor(
                         MzansiInnovationHub.of(context)!.theme.mode == "Dark")
@@ -68,12 +60,13 @@ class _BuildBusinessSearchResultsListState
                   ),
                   child: MihBusinessProfilePreview(
                     business: widget.businessList[index],
-                myLocation: widget.myLocation,
                   ),
                 ),
               ),
             );
           },
         );
+      },
+    );
   }
 }

Frontend/lib/mih_packages/mzansi_directory/builders/build_favourite_businesses_list.dart

@@ -1,18 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_business_profile_preview.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
+import 'package:provider/provider.dart';
 
 class BuildFavouriteBusinessesList extends StatefulWidget {
   final List<Business?> favouriteBusinesses;
-  final String? myLocation;
   const BuildFavouriteBusinessesList({
     super.key,
     required this.favouriteBusinesses,
-    required this.myLocation,
   });
 
   @override
@@ -24,6 +23,9 @@ class _BuildFavouriteBusinessesListState
     extends State<BuildFavouriteBusinessesList> {
   @override
   Widget build(BuildContext context) {
+    return Consumer<MzansiDirectoryProvider>(
+      builder: (BuildContext context, MzansiDirectoryProvider directoryProvider,
+          Widget? child) {
         return ListView.separated(
           shrinkWrap: true,
           physics: const NeverScrollableScrollPhysics(),
@@ -34,31 +36,20 @@ class _BuildFavouriteBusinessesListState
             );
           },
           itemBuilder: (context, index) {
-        final Business? business = widget.favouriteBusinesses[index];
+            if (widget.favouriteBusinesses[index] == null) {
-
-        if (business == null) {
               return const SizedBox(); // Or a placeholder if a business couldn't be loaded
             }
-
             return Material(
               color: MihColors.getPrimaryColor(
                   MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               child: InkWell(
                 onTap: () {
+                  directoryProvider.setSelectedBusiness(
+                    business: widget.favouriteBusinesses[index]!,
+                  );
                   context.goNamed(
                     'businessProfileView',
-                extra: BusinessViewArguments(
-                  widget.favouriteBusinesses[index]!,
-                  widget.favouriteBusinesses[index]!.Name,
-                ),
                   );
-              // Navigator.of(context).pushNamed(
-              //   '/business-profile/view',
-              //   arguments: BusinessViewArguments(
-              //     business,
-              //     business.Name,
-              //   ),
-              // );
                 },
                 splashColor: MihColors.getSecondaryColor(
                         MzansiInnovationHub.of(context)!.theme.mode == "Dark")
@@ -69,11 +60,14 @@ class _BuildFavouriteBusinessesListState
                     horizontal: 25,
                   ),
                   child: MihBusinessProfilePreview(
-                  business: business, myLocation: widget.myLocation),
+                    business: widget.favouriteBusinesses[index]!,
+                  ),
                 ),
               ),
             );
           },
         );
+      },
+    );
   }
 }

Frontend/lib/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart

@@ -3,7 +3,9 @@ import 'package:go_router/go_router.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_personal_profile_preview.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
+import 'package:provider/provider.dart';
 
 class BuildUserSearchResultsList extends StatefulWidget {
   final List<AppUser> userList;
@@ -21,6 +23,9 @@ class _BuildUserSearchResultsListState
     extends State<BuildUserSearchResultsList> {
   @override
   Widget build(BuildContext context) {
+    return Consumer<MzansiDirectoryProvider>(
+      builder: (BuildContext context, MzansiDirectoryProvider directoryProvider,
+          Widget? child) {
         return ListView.separated(
           shrinkWrap: true,
           physics: const NeverScrollableScrollPhysics(),
@@ -37,14 +42,11 @@ class _BuildUserSearchResultsListState
                   MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
               child: InkWell(
                 onTap: () {
-              context.goNamed(
+                  directoryProvider.setSelectedUser(
+                      user: widget.userList[index]);
+                  context.pushNamed(
                     'mzansiProfileView',
-                extra: widget.userList[index],
                   );
-              // Navigator.of(context).pushNamed(
-              //   '/mzansi-profile/view',
-              //   arguments: widget.userList[index],
-              // );
                 },
                 splashColor: MihColors.getSecondaryColor(
                         MzansiInnovationHub.of(context)!.theme.mode == "Dark")
@@ -55,13 +57,14 @@ class _BuildUserSearchResultsListState
                     // vertical: 5,
                     horizontal: 25,
                   ),
-              child: MihPersonalProfilePreview(
+                  child:
-                user: widget.userList[index],
+                      MihPersonalProfilePreview(user: widget.userList[index]),
-              ),
                 ),
               ),
             );
           },
         );
+      },
+    );
   }
 }

Frontend/lib/mih_packages/mzansi_directory/mzansi_directory.dart

@@ -1,19 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/package_tools/mih_favourite_businesses.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_location_services.dart';
+import 'package:provider/provider.dart';
 
 class MzansiDirectory extends StatefulWidget {
-  final MzansiDirectoryArguments arguments;
   const MzansiDirectory({
     super.key,
-    required this.arguments,
   });
 
   @override
@@ -21,75 +20,54 @@ class MzansiDirectory extends StatefulWidget {
 }
 
 class _MzansiDirectoryState extends State<MzansiDirectory> {
-  int _selcetedIndex = 0;
   late Future<Position?> futurePosition =
       MIHLocationAPI().getGPSPosition(context);
 
+  Future<void> initialiseGPSLocation() async {
+    MzansiDirectoryProvider directoryProvider =
+        context.read<MzansiDirectoryProvider>();
+    MIHLocationAPI().getGPSPosition(context).then((position) {
+      directoryProvider.setUserPosition(position);
+    });
+  }
+
   @override
   void initState() {
     super.initState();
-    if (widget.arguments.packageIndex == null) {
+    initialiseGPSLocation();
-      _selcetedIndex = 0;
-    } else {
-      _selcetedIndex = widget.arguments.packageIndex!;
-    }
   }
 
   @override
   Widget build(BuildContext context) {
-    print('MzansiDirectory build method called!');
     return MihPackage(
       appActionButton: getAction(),
       appTools: getTools(),
       appBody: getToolBody(),
       appToolTitles: getToolTitle(),
-      selectedbodyIndex: _selcetedIndex,
+      selectedbodyIndex: context.watch<MzansiDirectoryProvider>().toolIndex,
       onIndexChange: (newValue) {
-        setState(() {
+        context.read<MzansiDirectoryProvider>().setToolIndex(newValue);
-          _selcetedIndex = newValue;
-        });
       },
     );
   }
 
   List<Widget> getToolBody() {
-    List<Widget> toolBodies = [
+    List<Widget> toolBodies = [];
-      FutureBuilder(
+    // String myLocation = "Getting Your GPS Location Ready";
-          future: futurePosition,
+    // if (directoryProvider.userPosition != null) {
-          builder: (context, asyncSnapshot) {
+    //   myLocation = directoryProvider.userPosition
-            String myLocation = "";
+    //       .toString()
-            if (asyncSnapshot.connectionState == ConnectionState.waiting) {
+    //       .replaceAll("Latitude: ", "")
-              myLocation = "Getting Your GPS Location Ready";
+    //       .replaceAll("Longitude: ", "");
-            } else {
+    // }
-              myLocation = asyncSnapshot.data
+    toolBodies.addAll([
-                  .toString()
+      MihSearchMzansi(
-                  .replaceAll("Latitude: ", "")
+          // personalSearch: directoryProvider.personalSearch,
-                  .replaceAll("Longitude: ", "");
+          // startSearchText: "",
-            }
+          ),
-            return MihSearchMzansi(
-              personalSearch: widget.arguments.personalSearch,
-              myLocation: myLocation,
-              startSearchText: widget.arguments.startSearchText,
-            );
-          }),
       // MihContacts(),
-      FutureBuilder(
+      MihFavouriteBusinesses(),
-          future: futurePosition,
+    ]);
-          builder: (context, asyncSnapshot) {
-            String myLocation = "";
-            if (asyncSnapshot.connectionState == ConnectionState.waiting) {
-              myLocation = "Getting Your GPS Location Ready";
-            } else {
-              myLocation = asyncSnapshot.data
-                  .toString()
-                  .replaceAll("Latitude: ", "")
-                  .replaceAll("Longitude: ", "");
-            }
-            return MihFavouriteBusinesses(
-              myLocation: myLocation,
-            );
-          }),
-    ];
     return toolBodies;
   }
 
@@ -98,9 +76,13 @@ class _MzansiDirectoryState extends State<MzansiDirectory> {
       icon: const Icon(Icons.arrow_back),
       iconSize: 35,
       onTap: () {
+        MzansiDirectoryProvider directoryProvider =
+            context.read<MzansiDirectoryProvider>();
         context.goNamed(
           'mihHome',
         );
+        directoryProvider.setToolIndex(0);
+        directoryProvider.setPersonalSearch(true);
         FocusScope.of(context).unfocus();
       },
     );
@@ -109,23 +91,14 @@ class _MzansiDirectoryState extends State<MzansiDirectory> {
   MihPackageTools getTools() {
     Map<Widget, void Function()?> temp = {};
     temp[const Icon(Icons.search)] = () {
-      setState(() {
+      context.read<MzansiDirectoryProvider>().setToolIndex(0);
-        _selcetedIndex = 0;
-      });
     };
-    // temp[const Icon(Icons.person)] = () {
-    //   setState(() {
-    //     _selcetedIndex = 1;
-    //   });
-    // };
     temp[const Icon(Icons.business_center)] = () {
-      setState(() {
+      context.read<MzansiDirectoryProvider>().setToolIndex(1);
-        _selcetedIndex = 1;
-      });
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: _selcetedIndex,
+      selcetedIndex: context.watch<MzansiDirectoryProvider>().toolIndex,
     );
   }
 
@@ -133,7 +106,7 @@ class _MzansiDirectoryState extends State<MzansiDirectory> {
     List<String> toolTitles = [
       "Mzansi Search",
       "Favourite Businesses",
-      "Contacts",
+      // "Contacts",
     ];
     return toolTitles;
   }

Frontend/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart

@@ -1,18 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MzansiDirectoryTile extends StatefulWidget {
   final double packageSize;
-  final bool personalSelected;
   const MzansiDirectoryTile({
     super.key,
     required this.packageSize,
-    required this.personalSelected,
   });
 
   @override
@@ -26,10 +23,6 @@ class _MzansiDirectoryTileState extends State<MzansiDirectoryTile> {
       onTap: () {
         context.goNamed(
           "mzansiDirectory",
-          extra: MzansiDirectoryArguments(
-            personalSearch: widget.personalSelected,
-            startSearchText: null,
-          ),
         );
         // Navigator.of(context).pushNamed(
         //   '/mzansi-directory',

Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_favourite_businesses.dart

@@ -1,24 +1,22 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/bookmarked_business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/builders/build_favourite_businesses_list.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_directory_services.dart';
-import 'package:supertokens_flutter/supertokens.dart';
+import 'package:provider/provider.dart';
 
 class MihFavouriteBusinesses extends StatefulWidget {
-  final String? myLocation;
   const MihFavouriteBusinesses({
     super.key,
-    required this.myLocation,
   });
 
   @override
@@ -29,42 +27,42 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
   final TextEditingController businessSearchController =
       TextEditingController();
   final FocusNode searchFocusNode = FocusNode();
-  late Future<List<BookmarkedBusiness>> boookmarkedBusinessListFuture;
-  List<BookmarkedBusiness> listBookmarkedBusinesses = [];
   final ValueNotifier<List<Business?>> searchBookmarkedBusinesses =
       ValueNotifier([]);
-  late Future<Map<String, Business?>> businessDetailsMapFuture;
-  Map<String, Business?> _businessDetailsMap = {};
   Timer? _debounce;
 
-  Future<Map<String, Business?>>
+  Future<void> getAndMapAllBusinessDetailsForBookmarkedBusinesses(
-      getAndMapAllBusinessDetailsForBookmarkedBusinesses() async {
+    MzansiProfileProvider mzansiProfileProvider,
-    String user_id = await SuperTokens.getUserId();
+    MzansiDirectoryProvider directoryProvider,
-    List<BookmarkedBusiness> bookmarked = await MihMzansiDirectoryServices()
+  ) async {
-        .getAllUserBookmarkedBusiness(user_id);
+    await MihMzansiDirectoryServices().getAllUserBookmarkedBusiness(
-    listBookmarkedBusinesses = bookmarked;
+      mzansiProfileProvider.user!.app_id,
+      directoryProvider,
+    );
     Map<String, Business?> businessMap = {};
     List<Future<Business?>> detailFutures = [];
-    for (var item in bookmarked) {
+    for (var item in directoryProvider.bookmarkedBusinesses) {
       detailFutures.add(MihBusinessDetailsServices()
           .getBusinessDetailsByBusinessId(item.business_id));
     }
     List<Business?> details = await Future.wait(detailFutures);
-    for (int i = 0; i < bookmarked.length; i++) {
+    for (int i = 0; i < directoryProvider.bookmarkedBusinesses.length; i++) {
-      businessMap[bookmarked[i].business_id] = details[i];
+      businessMap[directoryProvider.bookmarkedBusinesses[i].business_id] =
+          details[i];
     }
-    _businessDetailsMap = businessMap;
+    directoryProvider.setBusinessDetailsMap(detailsMap: businessMap);
-    _filterAndSetBusinesses();
+    _filterAndSetBusinesses(directoryProvider);
-    return businessMap;
   }
 
-  void _filterAndSetBusinesses() {
+  void _filterAndSetBusinesses(MzansiDirectoryProvider directoryProvider) {
     List<Business?> businessesToDisplay = [];
     String query = businessSearchController.text.toLowerCase();
-    for (var bookmarked in listBookmarkedBusinesses) {
+    for (var bookmarked in directoryProvider.bookmarkedBusinesses) {
       if (bookmarked.business_name.toLowerCase().contains(query)) {
-        if (_businessDetailsMap.containsKey(bookmarked.business_id)) {
+        if (directoryProvider.businessDetailsMap
-          businessesToDisplay.add(_businessDetailsMap[bookmarked.business_id]);
+            .containsKey(bookmarked.business_id)) {
+          businessesToDisplay.add(
+              directoryProvider.businessDetailsMap[bookmarked.business_id]);
         }
       }
     }
@@ -82,14 +80,21 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
   @override
   void initState() {
     super.initState();
-    businessDetailsMapFuture =
+    MzansiDirectoryProvider directoryProvider =
-        getAndMapAllBusinessDetailsForBookmarkedBusinesses();
+        context.read<MzansiDirectoryProvider>();
+    MzansiProfileProvider mzansiProfileProvider =
+        context.read<MzansiProfileProvider>();
+
+    getAndMapAllBusinessDetailsForBookmarkedBusinesses(
+      mzansiProfileProvider,
+      directoryProvider,
+    );
     businessSearchController.addListener(() {
       if (_debounce?.isActive ?? false) {
         _debounce!.cancel();
       }
       _debounce = Timer(const Duration(milliseconds: 200), () {
-        _filterAndSetBusinesses();
+        _filterAndSetBusinesses(directoryProvider);
       });
     });
   }
@@ -123,23 +128,10 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
             ),
           ),
           const SizedBox(height: 10),
-          FutureBuilder<Map<String, Business?>>(
+          ValueListenableBuilder<List<Business?>>(
-              future: businessDetailsMapFuture,
+              valueListenable: searchBookmarkedBusinesses,
-              builder: (context, snapshot) {
+              builder: (context, filteredBusinesses, child) {
-                if (snapshot.connectionState == ConnectionState.waiting) {
+                if (filteredBusinesses.isEmpty &&
-                  return Mihloadingcircle(
-                    message: "Getting your favourites",
-                  );
-                } else if (snapshot.connectionState == ConnectionState.done) {
-                  if (snapshot.hasData && snapshot.data!.isNotEmpty) {
-                    // No need to re-filter here, _filterAndSetBusinesses is called in initState
-                    // and by the text controller listener.
-                    return ValueListenableBuilder<List<Business?>>(
-                      valueListenable:
-                          searchBookmarkedBusinesses, // Listen to changes in this
-                      builder: (context, businesses, child) {
-                        // Display message if no results after search
-                        if (businesses.isEmpty &&
                     businessSearchController.text.isNotEmpty) {
                   return Column(
                     children: [
@@ -148,9 +140,7 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
                         MihIcons.iDontKnow,
                         size: 165,
                         color: MihColors.getSecondaryColor(
-                                    MzansiInnovationHub.of(context)!
+                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                            .theme
-                                            .mode ==
                                 "Dark"),
                       ),
                       const SizedBox(height: 10),
@@ -162,25 +152,14 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
                           fontSize: 25,
                           fontWeight: FontWeight.bold,
                           color: MihColors.getSecondaryColor(
-                                      MzansiInnovationHub.of(context)!
+                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                              .theme
-                                              .mode ==
                                   "Dark"),
                         ),
                       ),
                     ],
                   );
-                        }
+                } else if (filteredBusinesses.isEmpty &&
-                        return BuildFavouriteBusinessesList(
+                    businessSearchController.text.isEmpty) {
-                          favouriteBusinesses:
-                              businesses, // Pass the filtered list from ValueNotifier
-                          myLocation: widget.myLocation,
-                        );
-                      },
-                    );
-                  } else {
-                    // This block handles the case where there are no bookmarked businesses initially
-
                   return Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 10.0),
                     child: Column(
@@ -224,18 +203,6 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
                               ),
                               children: [
                                 TextSpan(text: "Use the mzansi search"),
-                                  // WidgetSpan(
-                                  //   alignment:
-                                  //       PlaceholderAlignment.middle,
-                                  //   child: Icon(
-                                  //     Icons.search,
-                                  //     size: 20,
-                                  //     color:
-                                  //         MzansiInnovationHub.of(context)!
-                                  //             .theme
-                                  //             .secondaryColor(),
-                                  //   ),
-                                  // ),
                                 TextSpan(
                                     text:
                                         " to find your favourite businesses of mzansi"),
@@ -247,17 +214,9 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
                     ),
                   );
                 }
-                } else if (snapshot.hasError) {
+                return BuildFavouriteBusinessesList(
-                  return Center(
+                  favouriteBusinesses: filteredBusinesses,
-                    child: Text(
-                        "Error loading bookmarked businesses: ${snapshot.error}"), // Show specific error
                 );
-                } else {
-                  // Fallback for unexpected states
-                  return Center(
-                    child: Text("An unknown error occurred."),
-                  );
-                }
               }),
         ],
       ),

Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:ken_logger/ken_logger.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
@@ -9,22 +10,18 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
+import 'package:provider/provider.dart';
 
 class MihSearchMzansi extends StatefulWidget {
-  final bool personalSearch;
-  final String? myLocation;
-  final String? startSearchText;
   const MihSearchMzansi({
     super.key,
-    required this.personalSearch,
-    required this.myLocation,
-    required this.startSearchText,
   });
 
   @override
@@ -35,80 +32,87 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
   final TextEditingController mzansiSearchController = TextEditingController();
   final TextEditingController businessTypeController = TextEditingController();
   final FocusNode searchFocusNode = FocusNode();
-  late bool userSearch;
+  // late bool userSearch;
-  Future<List<AppUser>?> futureUserSearchResults = Future.value();
+  // Future<List<AppUser>?> futureUserSearchResults = Future.value();
-  Future<List<Business>?> futureBusinessSearchResults = Future.value();
   List<AppUser> userSearchResults = [];
   List<Business> businessSearchResults = [];
   late Future<List<String>> availableBusinessTypes;
   bool filterOn = false;
+  bool loadingSearchResults = false;
 
-  void swapPressed() {
+  Future<void> swapPressed(MzansiDirectoryProvider directoryProvider) async {
+    directoryProvider.setPersonalSearch(!directoryProvider.personalSearch);
     setState(() {
-      userSearch = !userSearch;
       if (filterOn) {
         filterOn = !filterOn;
       }
     });
     if (businessTypeController.text.isNotEmpty) {
       setState(() {
-        futureBusinessSearchResults = Future.value();
         businessTypeController.clear();
       });
     }
-    searchPressed();
+    await searchPressed(directoryProvider);
   }
 
-  void clearAll() {
+  void clearAll(MzansiDirectoryProvider directoryProvider) {
+    directoryProvider.setSearchedBusinesses(searchedBusinesses: []);
+    directoryProvider.setSearchedUsers(searchedUsers: []);
+    directoryProvider.setSearchTerm(searchTerm: "");
     setState(() {
-      futureUserSearchResults = Future.value();
-      futureBusinessSearchResults = Future.value();
       mzansiSearchController.clear();
       businessTypeController.clear();
     });
   }
 
-  void searchPressed() {
+  Future<void> searchPressed(MzansiDirectoryProvider directoryProvider) async {
     setState(() {
-      // userSearch = !userSearch;
+      loadingSearchResults = true;
-      if (userSearch && mzansiSearchController.text.isNotEmpty) {
+    });
-        futureUserSearchResults =
+    directoryProvider.setSearchTerm(searchTerm: mzansiSearchController.text);
-            MihUserServices().searchUsers(mzansiSearchController.text, context);
+    directoryProvider.setBusinessTypeFilter(
+        businessTypeFilter: businessTypeController.text);
+    if (directoryProvider.personalSearch &&
+        directoryProvider.searchTerm.isNotEmpty) {
+      final userResults = await MihUserServices()
+          .searchUsers(directoryProvider.searchTerm, context);
+      directoryProvider.setSearchedUsers(searchedUsers: userResults);
     } else {
-        if (
+      List<Business>? businessSearchResults = [];
-            // mzansiSearchController.text.isNotEmpty &&
+      if (directoryProvider.businessTypeFilter.isNotEmpty) {
-            businessTypeController.text.isNotEmpty) {
+        businessSearchResults = await MihBusinessDetailsServices()
-          futureBusinessSearchResults = MihBusinessDetailsServices()
+            .searchBusinesses(directoryProvider.searchTerm,
-              .searchBusinesses(mzansiSearchController.text,
+                directoryProvider.businessTypeFilter, context);
-                  businessTypeController.text, context);
+      } else if (directoryProvider.searchTerm.isNotEmpty) {
-        } else if (mzansiSearchController.text.isNotEmpty) {
+        businessSearchResults = await MihBusinessDetailsServices()
-          futureBusinessSearchResults = MihBusinessDetailsServices()
+            .searchBusinesses(directoryProvider.searchTerm,
-              .searchBusinesses(mzansiSearchController.text,
+                directoryProvider.businessTypeFilter, context);
-                  businessTypeController.text, context);
       }
+      directoryProvider.setSearchedBusinesses(
+          searchedBusinesses: businessSearchResults);
     }
+    setState(() {
+      loadingSearchResults = false;
     });
   }
 
   @override
   void dispose() {
     super.dispose();
+    businessTypeController.dispose();
     mzansiSearchController.dispose();
   }
 
   @override
   void initState() {
     super.initState();
+    MzansiDirectoryProvider directoryProvider =
+        context.read<MzansiDirectoryProvider>();
+    directoryProvider.setSearchedUsers(searchedUsers: []);
     setState(() {
-      userSearch = widget.personalSearch;
       availableBusinessTypes =
           MihBusinessDetailsServices().fetchAllBusinessTypes();
-      if (widget.startSearchText != null) {
-        mzansiSearchController.text = widget.startSearchText!;
-        searchPressed();
-      } else {
       mzansiSearchController.text = "";
-      }
     });
   }
 
@@ -123,6 +127,9 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
   }
 
   Widget getBody(double width) {
+    return Consumer<MzansiDirectoryProvider>(
+      builder: (BuildContext context, MzansiDirectoryProvider directoryProvider,
+          Widget? child) {
         return MihSingleChildScroll(
           child: Column(
             children: [
@@ -136,11 +143,13 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                         controller: mzansiSearchController,
                         hintText: "Search Mzansi",
                         prefixIcon: Icons.search,
-                    prefixAltIcon: userSearch ? Icons.person : Icons.business,
+                        prefixAltIcon: directoryProvider.personalSearch
+                            ? Icons.person
+                            : Icons.business,
                         suffixTools: [
                           IconButton(
                             onPressed: () {
-                          swapPressed();
+                              swapPressed(directoryProvider);
                             },
                             icon: Icon(
                               Icons.swap_horiz_rounded,
@@ -152,28 +161,30 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                           ),
                         ],
                         fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         hintColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         onPrefixIconTap: () {
-                      searchPressed();
+                          searchPressed(directoryProvider);
                         },
                         onClearIconTap: () {
-                      clearAll();
+                          clearAll(directoryProvider);
                         },
                         searchFocusNode: searchFocusNode,
                       ),
                     ),
                     Visibility(
-                  visible: !userSearch,
+                      visible: !directoryProvider.personalSearch,
                       child: const SizedBox(width: 10),
                     ),
                     Visibility(
-                  visible: !userSearch,
+                      visible: !directoryProvider.personalSearch,
                       child: IconButton(
                         onPressed: () {
                           if (filterOn) {
-                        clearAll();
+                            clearAll(directoryProvider);
                           }
                           setState(() {
                             filterOn = !filterOn;
@@ -223,7 +234,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                             MihButton(
                               onPressed: () {
                                 if (businessTypeController.text.isNotEmpty) {
-                              searchPressed();
+                                  searchPressed(directoryProvider);
                                 } else {
                                   MihAlertServices().errorAlert(
                                     "Business Type Not Selected",
@@ -240,7 +251,9 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                                 "Search",
                                 style: TextStyle(
                                   color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
+                                      MzansiInnovationHub.of(context)!
+                                              .theme
+                                              .mode ==
                                           "Dark"),
                                   fontSize: 20,
                                   fontWeight: FontWeight.bold,
@@ -253,171 +266,26 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                     );
                   }),
               const SizedBox(height: 10),
-          displaySearchResults(userSearch, widget.myLocation ?? ""),
+              displaySearchResults(directoryProvider),
             ],
           ),
         );
+      },
+    );
   }
 
-  Widget displaySearchResults(bool userSearch, String myLocation) {
+  Widget displayBusinessSearchResults(
-    if (userSearch) {
+      MzansiDirectoryProvider directoryProvider) {
-      return FutureBuilder(
+    KenLogger.success(
-        future: futureUserSearchResults,
+        "Searched Businesses: ${directoryProvider.searchedBusinesses}");
-        builder: (context, snapshot) {
+    if (directoryProvider.searchedBusinesses == null || loadingSearchResults) {
-          if (snapshot.connectionState == ConnectionState.waiting) {
-            return const Mihloadingcircle();
-          } else if (snapshot.connectionState == ConnectionState.done &&
-              snapshot.hasData &&
-              snapshot.requireData!.isNotEmpty) {
-            // return Text("Pulled Data successfully");
-            snapshot.requireData!
-                .sort((a, b) => a.username.compareTo(b.username));
-            return Column(
-              children: [
-                Text(
-                  "People of Mzansi",
-                  style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold),
-                ),
-                const SizedBox(height: 10),
-                BuildUserSearchResultsList(userList: snapshot.requireData!),
-              ],
-            );
-          } else if (!snapshot.hasData) {
-            return Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 10.0),
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  const SizedBox(height: 50),
-                  Icon(
-                    MihIcons.personalProfile,
-                    size: 165,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  ),
-                  const SizedBox(height: 10),
-                  Text(
-                    "Search for people of Mzansi!",
-                    textAlign: TextAlign.center,
-                    overflow: TextOverflow.visible,
-                    style: TextStyle(
-                      fontSize: 25,
-                      fontWeight: FontWeight.bold,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                    ),
-                  ),
-                  const SizedBox(height: 25),
-                  Center(
-                    child: RichText(
-                      textAlign: TextAlign.center,
-                      text: TextSpan(
-                        style: TextStyle(
-                          fontSize: 20,
-                          fontWeight: FontWeight.normal,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
-                        ),
-                        children: [
-                          TextSpan(text: "Press "),
-                          WidgetSpan(
-                            alignment: PlaceholderAlignment.middle,
-                            child: Icon(
-                              Icons.swap_horiz_rounded,
-                              size: 20,
-                              color: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                            ),
-                          ),
-                          TextSpan(text: " to search for businesses of Mzansi"),
-                        ],
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            );
-            // return Column(
-            //   mainAxisAlignment: MainAxisAlignment.center,
-            //   crossAxisAlignment: CrossAxisAlignment.center,
-            //   children: [
-            //     const SizedBox(height: 50),
-            //     Icon(
-            //       MihIcons.personalProfile,
-            //       size: 165,
-            //       color:
-            //           MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            //     ),
-            //     const SizedBox(height: 10),
-            //     Text(
-            //       "People Of Mzansi!",
-            //       textAlign: TextAlign.center,
-            //       overflow: TextOverflow.visible,
-            //       style: TextStyle(
-            //         fontSize: 25,
-            //         fontWeight: FontWeight.bold,
-            //         color:
-            //             MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            //       ),
-            //     ),
-            //   ],
-            // );
-          } else if (snapshot.connectionState == ConnectionState.done &&
-              snapshot.hasData &&
-              snapshot.requireData!.isEmpty) {
-            // return Text("Pulled Data successfully");
-            return Column(
-              children: [
-                const SizedBox(height: 50),
-                Icon(
-                  MihIcons.iDontKnow,
-                  size: 165,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                ),
-                const SizedBox(height: 10),
-                Text(
-                  "Let's try refining your search",
-                  textAlign: TextAlign.center,
-                  overflow: TextOverflow.visible,
-                  style: TextStyle(
-                    fontSize: 25,
-                    fontWeight: FontWeight.bold,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  ),
-                ),
-              ],
-            );
-          } else {
       return Center(
-              child: Text(
+        child: const Mihloadingcircle(),
-                "Error pulling Patients Data\n/users/search/${mzansiSearchController.text}",
-                style: TextStyle(
-                    fontSize: 25,
-                    color: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
-                textAlign: TextAlign.center,
-              ),
       );
-          }
+    } else if (directoryProvider.searchedBusinesses!.isNotEmpty) {
-        },
-      );
-    } else {
-      return FutureBuilder(
-        future: futureBusinessSearchResults,
-        builder: (context, snapshot) {
-          if (snapshot.connectionState == ConnectionState.waiting) {
-            return const Mihloadingcircle();
-          } else if (snapshot.connectionState == ConnectionState.done &&
-              snapshot.hasData &&
-              snapshot.requireData!.isNotEmpty) {
       // return Text("Pulled Data successfully");
-            snapshot.requireData!.sort((a, b) => a.Name.compareTo(b.Name));
+      directoryProvider.searchedBusinesses!
+          .sort((a, b) => a.Name.compareTo(b.Name));
       return Column(
         children: [
           Text(
@@ -426,15 +294,12 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
           ),
           const SizedBox(height: 10),
           BuildBusinessSearchResultsList(
-                  businessList: snapshot.requireData!,
+            businessList: directoryProvider.searchedBusinesses!,
-                  myLocation: myLocation,
-                  startUpSearch: mzansiSearchController.text,
           ),
         ],
       );
-          } else if (snapshot.connectionState == ConnectionState.done &&
+    } else if (directoryProvider.searchedBusinesses!.isEmpty &&
-              snapshot.hasData &&
+        directoryProvider.searchTerm.isNotEmpty) {
-              snapshot.requireData!.isEmpty) {
       // return Text("Pulled Data successfully");
       return Column(
         children: [
@@ -459,7 +324,8 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
           ),
         ],
       );
-          } else if (!snapshot.hasData) {
+    } else if (directoryProvider.searchedBusinesses!.isEmpty &&
+        directoryProvider.searchTerm.isEmpty) {
       return Padding(
         padding: const EdgeInsets.symmetric(horizontal: 10.0),
         child: Column(
@@ -482,8 +348,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                 fontSize: 25,
                 fontWeight: FontWeight.bold,
                 color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                              "Dark"),
               ),
             ),
             const SizedBox(height: 25),
@@ -495,8 +360,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                     fontSize: 20,
                     fontWeight: FontWeight.normal,
                     color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                                  "Dark"),
                   ),
                   children: [
                     TextSpan(text: "Press "),
@@ -524,8 +388,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                     fontSize: 20,
                     fontWeight: FontWeight.normal,
                     color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                                  "Dark"),
                   ),
                   children: [
                     TextSpan(text: "Press "),
@@ -550,7 +413,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
     } else {
       return Center(
         child: Text(
-                "Error pulling Patients Data\n/users/search/${mzansiSearchController.text}",
+          "Error pulling Patients Data\n/users/search/${directoryProvider.searchTerm}",
           style: TextStyle(
               fontSize: 25,
               color: MihColors.getRedColor(
@@ -559,8 +422,131 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
         ),
       );
     }
-        },
+  }
+
+  Widget displayPersonalSearchResults(
+      MzansiDirectoryProvider directoryProvider) {
+    if (directoryProvider.searchedUsers == null || loadingSearchResults) {
+      return Center(
+        child: const Mihloadingcircle(),
+      );
+    } else if (directoryProvider.searchedUsers!.isNotEmpty) {
+      // return Text("Pulled Data successfully");
+      directoryProvider.searchedUsers!
+          .sort((a, b) => a.username.compareTo(b.username));
+      return Column(
+        children: [
+          Text(
+            "People of Mzansi",
+            style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold),
+          ),
+          const SizedBox(height: 10),
+          BuildUserSearchResultsList(
+              userList: directoryProvider.searchedUsers!),
+        ],
+      );
+    } else if (directoryProvider.searchedUsers!.isEmpty &&
+        directoryProvider.searchTerm.isEmpty) {
+      return Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 10.0),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            const SizedBox(height: 50),
+            Icon(
+              MihIcons.personalProfile,
+              size: 165,
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            ),
+            const SizedBox(height: 10),
+            Text(
+              "Search for people of Mzansi!",
+              textAlign: TextAlign.center,
+              overflow: TextOverflow.visible,
+              style: TextStyle(
+                fontSize: 25,
+                fontWeight: FontWeight.bold,
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              ),
+            ),
+            const SizedBox(height: 25),
+            Center(
+              child: RichText(
+                textAlign: TextAlign.center,
+                text: TextSpan(
+                  style: TextStyle(
+                    fontSize: 20,
+                    fontWeight: FontWeight.normal,
+                    color: MihColors.getSecondaryColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  ),
+                  children: [
+                    TextSpan(text: "Press "),
+                    WidgetSpan(
+                      alignment: PlaceholderAlignment.middle,
+                      child: Icon(
+                        Icons.swap_horiz_rounded,
+                        size: 20,
+                        color: MihColors.getSecondaryColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
+                      ),
+                    ),
+                    TextSpan(text: " to search for businesses of Mzansi"),
+                  ],
+                ),
+              ),
+            ),
+          ],
+        ),
+      );
+    } else if (directoryProvider.searchedUsers!.isEmpty &&
+        directoryProvider.searchTerm.isNotEmpty) {
+      return Column(
+        children: [
+          const SizedBox(height: 50),
+          Icon(
+            MihIcons.iDontKnow,
+            size: 165,
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          ),
+          const SizedBox(height: 10),
+          Text(
+            "Let's try refining your search",
+            textAlign: TextAlign.center,
+            overflow: TextOverflow.visible,
+            style: TextStyle(
+              fontSize: 25,
+              fontWeight: FontWeight.bold,
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            ),
+          ),
+        ],
+      );
+    } else {
+      return Center(
+        child: Text(
+          "Error pulling Patients Data\n/users/search/${directoryProvider.searchTerm}",
+          style: TextStyle(
+              fontSize: 25,
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
+          textAlign: TextAlign.center,
+        ),
       );
     }
   }
+
+  Widget displaySearchResults(MzansiDirectoryProvider directoryProvider) {
+    if (directoryProvider.personalSearch) {
+      return displayPersonalSearchResults(directoryProvider);
+    } else {
+      return displayBusinessSearchResults(directoryProvider);
+    }
+  }
 }

Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart

@@ -1,21 +1,23 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_directory_services.dart';
-import 'package:supertokens_flutter/supertokens.dart';
+import 'package:provider/provider.dart';
 
 class MihAddBookmarkAlert extends StatefulWidget {
   final Business business;
+  final void Function()? onSuccessDismissPressed;
   const MihAddBookmarkAlert({
     super.key,
     required this.business,
+    required this.onSuccessDismissPressed,
   });
 
   @override
@@ -23,16 +25,16 @@ class MihAddBookmarkAlert extends StatefulWidget {
 }
 
 class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
-  Future<void> addBookmark(String business_id) async {
+  Future<void> addBookmark(
+      MzansiProfileProvider profileProvider, String business_id) async {
     showDialog(
       context: context,
       builder: (context) {
         return const Mihloadingcircle();
       },
     );
-    String user_id = await SuperTokens.getUserId();
     await MihMzansiDirectoryServices()
-        .addBookmarkedBusiness(user_id, business_id)
+        .addBookmarkedBusiness(profileProvider.user!.app_id, business_id)
         .then((statusCode) {
       context.pop();
       if (statusCode == 201) {
@@ -77,14 +79,9 @@ class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
               Center(
                 child: MihButton(
                   onPressed: () {
-                    context.goNamed(
+                    widget.onSuccessDismissPressed!.call();
-                      "mzansiDirectory",
+                    context.pop();
-                      extra: MzansiDirectoryArguments(
+                    context.pop();
-                        personalSearch: false,
-                        startSearchText: widget.business.Name,
-                        packageIndex: 1,
-                      ),
-                    );
                   },
                   buttonColor: MihColors.getGreenColor(
                       MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
@@ -117,6 +114,9 @@ class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
 
   @override
   Widget build(BuildContext context) {
+    return Consumer<MzansiProfileProvider>(
+      builder: (BuildContext context, MzansiProfileProvider profileProvider,
+          Widget? child) {
         return MihPackageAlert(
           alertColour: MihColors.getSecondaryColor(
               MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
@@ -153,7 +153,8 @@ class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
                       "Cancel",
                       style: TextStyle(
                         color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -162,7 +163,7 @@ class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
                   MihButton(
                     width: 300,
                     onPressed: () {
-                  addBookmark(widget.business.business_id);
+                      addBookmark(profileProvider, widget.business.business_id);
                     },
                     buttonColor: MihColors.getGreenColor(
                         MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
@@ -170,7 +171,8 @@ class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
                       "Bookmark Business",
                       style: TextStyle(
                         color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -181,5 +183,7 @@ class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
             ],
           ),
         );
+      },
+    );
   }
 }

Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart

@@ -7,23 +7,24 @@ import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_review
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart';
+import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_directory_services.dart';
+import 'package:provider/provider.dart';
 import 'package:redacted/redacted.dart';
 import 'package:supertokens_flutter/supertokens.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class MihBusinessCard extends StatefulWidget {
   final Business business;
-  final String? startUpSearch;
   final double width;
   const MihBusinessCard({
     super.key,
     required this.business,
-    required this.startUpSearch,
     required this.width,
   });
 
@@ -409,6 +410,9 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
   @override
   Widget build(BuildContext context) {
     // double screenWidth = MediaQuery.of(context).size.width;
+    return Consumer<MzansiDirectoryProvider>(
+      builder: (BuildContext context, MzansiDirectoryProvider directoryProvider,
+          Widget? child) {
         return Material(
           color: MihColors.getSecondaryColor(
                   MzansiInnovationHub.of(context)!.theme.mode == "Dark")
@@ -463,14 +467,16 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                     children: [
                       Divider(
                         color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                       ),
                       _buildContactInfo(
                         "Location",
                         "Come visit us.",
                         Icons.location_on,
                         MihColors.getOrangeColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         false,
                         () {
                           final latitude = double.parse(
@@ -493,14 +499,16 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                     children: [
                       Divider(
                         color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                       ),
                       _buildContactInfo(
                         "Website",
                         "Find out more about us.",
                         Icons.vpn_lock,
                         MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         false,
                         () {
                           _launchWebsite(widget.business.website);
@@ -512,12 +520,14 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                 FutureBuilder(
                   future: _businessReviewFuture,
                   builder: (context, asyncSnapshot) {
-                if (asyncSnapshot.connectionState == ConnectionState.waiting) {
+                    if (asyncSnapshot.connectionState ==
+                        ConnectionState.waiting) {
                       // return const SizedBox.shrink();
                       return Column(
                         children: [
                           Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 10.0),
+                            padding:
+                                const EdgeInsets.symmetric(horizontal: 10.0),
                             child: Divider(
                               color: MihColors.getPrimaryColor(
                                   MzansiInnovationHub.of(context)!.theme.mode ==
@@ -549,7 +559,8 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                       return Column(
                         children: [
                           Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 10.0),
+                            padding:
+                                const EdgeInsets.symmetric(horizontal: 10.0),
                             child: Divider(
                               color: MihColors.getPrimaryColor(
                                   MzansiInnovationHub.of(context)!.theme.mode ==
@@ -565,7 +576,7 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                                     "Dark"),
                             false,
                             () {
-                          businessReviewRatingWindow(
+                              businessReviewRatingWindow(directoryProvider,
                                   businessReview, true, widget.width);
                             },
                           ),
@@ -577,12 +588,14 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                 FutureBuilder(
                   future: _bookmarkedBusinessFuture,
                   builder: (context, asyncSnapshot) {
-                if (asyncSnapshot.connectionState == ConnectionState.waiting) {
+                    if (asyncSnapshot.connectionState ==
+                        ConnectionState.waiting) {
                       // return const SizedBox.shrink();
                       return Column(
                         children: [
                           Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 10.0),
+                            padding:
+                                const EdgeInsets.symmetric(horizontal: 10.0),
                             child: Divider(
                               color: MihColors.getPrimaryColor(
                                   MzansiInnovationHub.of(context)!.theme.mode ==
@@ -614,7 +627,8 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
                       return Column(
                         children: [
                           Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 10.0),
+                            padding:
+                                const EdgeInsets.symmetric(horizontal: 10.0),
                             child: Divider(
                               color: MihColors.getPrimaryColor(
                                   MzansiInnovationHub.of(context)!.theme.mode ==
@@ -673,10 +687,15 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
             ),
           ),
         );
+      },
+    );
   }
 
   Future<void> businessReviewRatingWindow(
-      BusinessReview? myReview, bool previouslyRated, double width) async {
+      MzansiDirectoryProvider directoryProvider,
+      BusinessReview? myReview,
+      bool previouslyRated,
+      double width) async {
     if (_isUserSignedIn) {
       showDialog(
         context: context,
@@ -685,6 +704,17 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
           businessReview: myReview,
           screenWidth: width,
           readOnly: false,
+          onSuccessDismissPressed: () async {
+            List<Business>? businessSearchResults = [];
+            businessSearchResults = await MihBusinessDetailsServices()
+                .searchBusinesses(directoryProvider.searchTerm,
+                    directoryProvider.businessTypeFilter, context);
+            directoryProvider.setSearchedBusinesses(
+                searchedBusinesses: businessSearchResults);
+            setState(() {
+              _businessReviewFuture = getUserReview();
+            });
+          },
         ),
       );
     } else {
@@ -698,6 +728,11 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
         context: context,
         builder: (context) => MihAddBookmarkAlert(
           business: widget.business,
+          onSuccessDismissPressed: () {
+            setState(() {
+              _bookmarkedBusinessFuture = getUserBookmark();
+            });
+          },
         ),
       );
     } else {
@@ -712,7 +747,12 @@ class _MihBusinessCardState extends State<MihBusinessCard> {
           builder: (context) => MihDeleteBookmarkAlert(
                 business: widget.business,
                 bookmarkBusiness: bookmarkBusiness,
-                startUpSearch: widget.startUpSearch,
+                onSuccessDismissPressed: () {
+                  setState(() {
+                    _bookmarkedBusinessFuture = getUserBookmark();
+                  });
+                },
+                // startUpSearch: widget.startUpSearch,
               ));
     } else {
       showSignInRequiredAlert();

Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/bookmarked_business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
@@ -14,12 +13,14 @@ import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_directory_services
 class MihDeleteBookmarkAlert extends StatefulWidget {
   final Business business;
   final BookmarkedBusiness? bookmarkBusiness;
-  final String? startUpSearch;
+  final void Function()? onSuccessDismissPressed;
+  // final String? startUpSearch;
   const MihDeleteBookmarkAlert({
     super.key,
     required this.business,
     required this.bookmarkBusiness,
-    required this.startUpSearch,
+    required this.onSuccessDismissPressed,
+    // required this.startUpSearch,
   });
 
   @override
@@ -80,14 +81,17 @@ class _MihDeleteBookmarkAlertState extends State<MihDeleteBookmarkAlert> {
               Center(
                 child: MihButton(
                   onPressed: () {
-                    context.goNamed(
+                    // context.goNamed(
-                      "mzansiDirectory",
+                    //   "mzansiDirectory",
-                      extra: MzansiDirectoryArguments(
+                    //   extra: MzansiDirectoryArguments(
-                        personalSearch: false,
+                    //     personalSearch: false,
-                        startSearchText: widget.business.Name,
+                    //     startSearchText: widget.business.Name,
-                        packageIndex: 1,
+                    //     packageIndex: 1,
-                      ),
+                    //   ),
-                    );
+                    // );
+                    widget.onSuccessDismissPressed!.call();
+                    context.pop();
+                    context.pop();
                   },
                   buttonColor: MihColors.getGreenColor(
                       MzansiInnovationHub.of(context)!.theme.mode == "Dark"),

Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_review.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart';
@@ -13,23 +12,28 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
+import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_directory_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
-import 'package:supertokens_flutter/supertokens.dart';
+import 'package:provider/provider.dart';
 
 class MihReviewBusinessWindow extends StatefulWidget {
   final Business business;
   final BusinessReview? businessReview;
   final double screenWidth;
   final bool readOnly;
+  final void Function()? onSuccessDismissPressed;
   const MihReviewBusinessWindow({
     super.key,
     required this.business,
     required this.businessReview,
     required this.screenWidth,
     required this.readOnly,
+    required this.onSuccessDismissPressed,
   });
 
   @override
@@ -47,9 +51,8 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
       TextEditingController();
   late final VoidCallback _reviewDescriptionListener;
   final ValueNotifier<int> _counter = ValueNotifier<int>(0);
-  String userId = "";
 
-  void showDeleteReviewAlert() {
+  void showDeleteReviewAlert(MzansiDirectoryProvider directoryProvider) {
     showDialog(
       context: context,
       builder: (context) => MihPackageAlert(
@@ -93,10 +96,11 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                       widget.businessReview!.rating_score,
                       widget.business.rating,
                     )
-                        .then((statusCode) {
+                        .then((statusCode) async {
                       context.pop(); //Remove loading dialog
                       context.pop(); //Remove delete dialog
                       if (statusCode == 200) {
+                        await refreshBusiness(directoryProvider);
                         context.pop(); //Remove window
                         successPopUp(
                           "Successfully Deleted Review!",
@@ -160,7 +164,19 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
     }
   }
 
-  void submitForm() async {
+  Future<void> refreshBusiness(
+      MzansiDirectoryProvider directoryProvider) async {
+    Business? refresedBusiness = await MihBusinessDetailsServices()
+        .getBusinessDetailsByBusinessId(widget.business.business_id);
+    if (refresedBusiness != null) {
+      directoryProvider.setSelectedBusiness(business: refresedBusiness);
+    }
+  }
+
+  void submitForm(
+    MzansiProfileProvider profileProvider,
+    MzansiDirectoryProvider directoryProvider,
+  ) async {
     showDialog(
       context: context,
       builder: (context) {
@@ -178,9 +194,10 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
         widget.businessReview!.rating_score,
         widget.business.rating,
       )
-          .then((statusCode) {
+          .then((statusCode) async {
         context.pop(); //Remove loading dialog
         if (statusCode == 200) {
+          await refreshBusiness(directoryProvider);
           context.pop();
           successPopUp(
             "Successfully Updated Review!",
@@ -197,16 +214,17 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
     } else {
       await MihMzansiDirectoryServices()
           .addBusinessReview(
-        userId,
+        profileProvider.user!.app_id,
         widget.business.business_id,
         _reviewTitleController.text,
         _reviewDescriptionController.text,
         _reviewScoreController.text,
         widget.business.rating.isEmpty ? "0.0" : widget.business.rating,
       )
-          .then((statusCode) {
+          .then((statusCode) async {
         context.pop(); //Remove loading dialog
         if (statusCode == 201) {
+          await refreshBusiness(directoryProvider);
           context.pop();
           successPopUp(
             "Successfully Added Review!",
@@ -250,13 +268,15 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
               Center(
                 child: MihButton(
                   onPressed: () {
-                    context.goNamed(
+                    // context.goNamed(
-                      "mzansiDirectory",
+                    //   "mzansiDirectory",
-                      extra: MzansiDirectoryArguments(
+                    //   extra: MzansiDirectoryArguments(
-                        personalSearch: false,
+                    //     personalSearch: false,
-                        startSearchText: widget.business.Name,
+                    //     startSearchText: widget.business.Name,
-                      ),
+                    //   ),
-                    );
+                    // );
+                    widget.onSuccessDismissPressed!.call();
+                    context.pop();
                   },
                   buttonColor: MihColors.getGreenColor(
                       MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
@@ -323,16 +343,14 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
     } else {
       _reviewScoreController.text = "1.0"; // Default score
     }
-    SuperTokens.getUserId().then((value) {
-      setState(() {
-        userId = value;
-      });
-    });
   }
 
   @override
   Widget build(BuildContext context) {
     // return const Placeholder();
+    return Consumer2<MzansiProfileProvider, MzansiDirectoryProvider>(
+      builder: (BuildContext context, MzansiProfileProvider profileProvider,
+          MzansiDirectoryProvider directoryProvider, Widget? child) {
         return MihPackageWindow(
           fullscreen: false,
           windowTitle: getWindowTitle(),
@@ -345,28 +363,30 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                     child: Icon(
                       Icons.delete,
                       color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                     ),
                     label: "Delete Review",
                     labelBackgroundColor: MihColors.getGreenColor(
                         MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     labelStyle: TextStyle(
                       color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       fontWeight: FontWeight.bold,
                     ),
                     backgroundColor: MihColors.getGreenColor(
                         MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                     onTap: () {
-                  showDeleteReviewAlert();
+                      showDeleteReviewAlert(directoryProvider);
                     },
                   ),
                 ]
               : null,
           windowBody: MihSingleChildScroll(
             child: Padding(
-          padding:
+              padding: MzansiInnovationHub.of(context)!.theme.screenType ==
-              MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
+                      "desktop"
                   ? EdgeInsets.symmetric(horizontal: widget.screenWidth * 0.05)
                   : EdgeInsets.symmetric(horizontal: widget.screenWidth * 0),
               child: Column(
@@ -478,9 +498,11 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                       MihTextFormField(
                         // width: 200,
                         fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         controller: _reviewTitleController,
                         multiLineInput: false,
                         requiredText: true,
@@ -495,9 +517,11 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                       MihTextFormField(
                         height: 250,
                         fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         inputColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                         controller: _reviewDescriptionController,
                         multiLineInput: true,
                         requiredText: widget.readOnly,
@@ -518,8 +542,8 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                           height: 15,
                           child: ValueListenableBuilder(
                             valueListenable: _counter,
-                        builder:
+                            builder: (BuildContext context, int value,
-                            (BuildContext context, int value, Widget? child) {
+                                Widget? child) {
                               return Row(
                                 mainAxisSize: MainAxisSize.max,
                                 mainAxisAlignment: MainAxisAlignment.end,
@@ -552,9 +576,13 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                           child: MihButton(
                             onPressed: () {
                               if (_formKey.currentState!.validate()) {
-                            submitForm();
+                                submitForm(
+                                  profileProvider,
+                                  directoryProvider,
+                                );
                               } else {
-                            MihAlertServices().formNotFilledCompletely(context);
+                                MihAlertServices()
+                                    .formNotFilledCompletely(context);
                               }
                             },
                             buttonColor: MihColors.getGreenColor(
@@ -567,7 +595,9 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                                   : "Add Review",
                               style: TextStyle(
                                 color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
+                                    MzansiInnovationHub.of(context)!
+                                            .theme
+                                            .mode ==
                                         "Dark"),
                                 fontSize: 20,
                                 fontWeight: FontWeight.bold,
@@ -583,5 +613,7 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
             ),
           ),
         );
+      },
+    );
   }
 }

Frontend/lib/mih_packages/mzansi_profile/business_profile/mzansi_business_profile.dart

@@ -86,7 +86,7 @@ class _MzansiBusinessProfileState extends State<MzansiBusinessProfile> {
           business: context.watch<MzansiProfileProvider>().business!),
       MihBusinessQrCode(
         business: context.watch<MzansiProfileProvider>().business!,
-        startUpSearch: "",
+        // startUpSearch: "",
       ),
     ];
     return toolBodies;

Frontend/lib/mih_packages/mzansi_profile/business_profile/mzansi_business_profile_view.dart

@@ -1,23 +1,22 @@
 import 'package:go_router/go_router.dart';
 import 'package:ken_logger/ken_logger.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_view.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_qr_code.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
+import 'package:provider/provider.dart';
 
 class MzansiBusinessProfileView extends StatefulWidget {
-  final BusinessViewArguments? arguments;
   final String? businessId;
   const MzansiBusinessProfileView({
     super.key,
-    required this.arguments,
     required this.businessId,
   });
 
@@ -28,16 +27,10 @@ class MzansiBusinessProfileView extends StatefulWidget {
 
 class _MzansiBusinessProfileViewState extends State<MzansiBusinessProfileView> {
   int _selcetedIndex = 0;
-  Business? business;
-  String startUpSearch = "";
 
-  Future<void> _fetchBusinessDetails() async {
+  Future<void> _fetchBusinessDetails(
-    if (widget.arguments != null) {
+      MzansiDirectoryProvider directoryProvider) async {
-      setState(() {
+    if (widget.businessId != null) {
-        business = widget.arguments!.business;
-        startUpSearch = widget.arguments!.startUpSearch ?? "";
-      });
-    } else if (widget.businessId != null) {
       final biz = await MihBusinessDetailsServices()
           .getBusinessDetailsByBusinessId(widget.businessId!);
       if (biz == null) {
@@ -47,10 +40,7 @@ class _MzansiBusinessProfileViewState extends State<MzansiBusinessProfileView> {
         );
       } else {
         KenLogger.success("Business found: ${biz.Name}");
-        setState(() {
+        directoryProvider.setSelectedBusiness(business: biz);
-          business = biz;
-          startUpSearch = "";
-        });
       }
     }
   }
@@ -58,12 +48,17 @@ class _MzansiBusinessProfileViewState extends State<MzansiBusinessProfileView> {
   @override
   void initState() {
     super.initState();
-    _fetchBusinessDetails();
+    MzansiDirectoryProvider directoryProvider =
+        context.read<MzansiDirectoryProvider>();
+    _fetchBusinessDetails(directoryProvider);
   }
 
   @override
   Widget build(BuildContext context) {
-    if (business == null) {
+    return Consumer<MzansiDirectoryProvider>(
+      builder: (BuildContext context, MzansiDirectoryProvider directoryProvider,
+          Widget? child) {
+        if (directoryProvider.selectedBusiness == null) {
           KenLogger.warning("Business is null, showing loading indicator");
           return Scaffold(
             body: const Center(
@@ -74,7 +69,7 @@ class _MzansiBusinessProfileViewState extends State<MzansiBusinessProfileView> {
           return MihPackage(
             appActionButton: getAction(),
             appTools: getTools(),
-        appBody: getToolBody(),
+            appBody: getToolBody(directoryProvider),
             appToolTitles: getToolTitle(),
             selectedbodyIndex: _selcetedIndex,
             onIndexChange: (newValue) {
@@ -84,6 +79,8 @@ class _MzansiBusinessProfileViewState extends State<MzansiBusinessProfileView> {
             },
           );
         }
+      },
+    );
   }
 
   MihPackageAction getAction() {
@@ -91,13 +88,18 @@ class _MzansiBusinessProfileViewState extends State<MzansiBusinessProfileView> {
       icon: const Icon(Icons.arrow_back),
       iconSize: 35,
       onTap: () {
+        MzansiProfileProvider profileProvider =
+            context.read<MzansiProfileProvider>();
+        if (profileProvider.user == null) {
           context.goNamed(
-          "mzansiDirectory",
+            'mihHome',
-          extra: MzansiDirectoryArguments(
-            personalSearch: false,
-            startSearchText: business!.Name,
-          ),
           );
+        } else {
+          context.pop();
+        }
+        // context.goNamed(
+        //   "mzansiDirectory",
+        // );
         FocusScope.of(context).unfocus();
       },
     );
@@ -126,16 +128,12 @@ class _MzansiBusinessProfileViewState extends State<MzansiBusinessProfileView> {
     );
   }
 
-  List<Widget> getToolBody() {
+  List<Widget> getToolBody(MzansiDirectoryProvider directoryProvider) {
     List<Widget> toolBodies = [
-      MihBusinessDetailsView(
+      MihBusinessDetailsView(),
-        business: business!,
+      MihBusinessReviews(business: directoryProvider.selectedBusiness!),
-        startUpSearch: startUpSearch,
-      ),
-      MihBusinessReviews(business: business!),
       MihBusinessQrCode(
-        business: business!,
+        business: directoryProvider.selectedBusiness!,
-        startUpSearch: startUpSearch,
       )
     ];
     return toolBodies;

Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart

@@ -135,7 +135,7 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                       width: 700,
                       child: MihBusinessCard(
                         business: mzansiProfileProvider.business!,
-                        startUpSearch: null,
+                        // startUpSearch: null,
                         width: width,
                       ),
                     ),

Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_view.dart

@@ -2,22 +2,19 @@ import 'package:custom_rating_bar/custom_rating_bar.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
+import 'package:provider/provider.dart';
 
 class MihBusinessDetailsView extends StatefulWidget {
-  final Business business;
-  final String? startUpSearch;
   const MihBusinessDetailsView({
     super.key,
-    required this.business,
-    required this.startUpSearch,
   });
 
   @override
@@ -36,8 +33,10 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
   @override
   void initState() {
     super.initState();
-    futureImageUrl =
+    MzansiDirectoryProvider directoryProvider =
-        MihFileApi.getMinioFileUrl(widget.business.logo_path, context);
+        context.read<MzansiDirectoryProvider>();
+    futureImageUrl = MihFileApi.getMinioFileUrl(
+        directoryProvider.selectedBusiness!.logo_path, context);
   }
 
   @override
@@ -52,12 +51,15 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
 
   Widget getBody(double width, BuildContext context) {
     double profilePictureWidth = 150;
+    return Consumer<MzansiDirectoryProvider>(
+      builder: (BuildContext context, MzansiDirectoryProvider directoryProvider,
+          Widget? child) {
         return Stack(
           children: [
             MihSingleChildScroll(
               child: Padding(
-            padding:
+                padding: MzansiInnovationHub.of(context)!.theme.screenType ==
-                MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
+                        "desktop"
                     ? EdgeInsets.symmetric(horizontal: width * 0.2)
                     : EdgeInsets.symmetric(horizontal: width * 0.075),
                 child: Column(
@@ -70,16 +72,21 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                               asyncSnapshot.hasData) {
                             if (asyncSnapshot.requireData != "") {
                               return MihCircleAvatar(
-                            imageFile: NetworkImage(asyncSnapshot.requireData),
+                                imageFile:
+                                    NetworkImage(asyncSnapshot.requireData),
                                 width: profilePictureWidth,
                                 editable: false,
                                 fileNameController: TextEditingController(),
                                 userSelectedfile: file,
                                 frameColor: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
+                                    MzansiInnovationHub.of(context)!
+                                            .theme
+                                            .mode ==
                                         "Dark"),
                                 backgroundColor: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
+                                    MzansiInnovationHub.of(context)!
+                                            .theme
+                                            .mode ==
                                         "Dark"),
                                 onChange: () {},
                               );
@@ -88,7 +95,9 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                                 MihIcons.iDontKnow,
                                 size: profilePictureWidth,
                                 color: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
+                                    MzansiInnovationHub.of(context)!
+                                            .theme
+                                            .mode ==
                                         "Dark"),
                               );
                             }
@@ -122,7 +131,7 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                     // ),
                     FittedBox(
                       child: Text(
-                    widget.business.Name,
+                        directoryProvider.selectedBusiness!.Name,
                         style: TextStyle(
                           fontSize: 35,
                           fontWeight: FontWeight.bold,
@@ -134,7 +143,7 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                     ),
                     FittedBox(
                       child: Text(
-                    widget.business.type,
+                        directoryProvider.selectedBusiness!.type,
                         style: TextStyle(
                           fontSize: 20,
                           fontWeight: FontWeight.w600,
@@ -161,8 +170,10 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                       child: SizedBox(
                         width: 700,
                         child: Text(
-                      widget.business.mission_vision.isNotEmpty
+                          directoryProvider
-                          ? widget.business.mission_vision
+                                  .selectedBusiness!.mission_vision.isNotEmpty
+                              ? directoryProvider
+                                  .selectedBusiness!.mission_vision
                               : "No Mission & Vision added yet",
                           textAlign: TextAlign.center,
                           style: TextStyle(
@@ -183,16 +194,21 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                       emptyIcon: Icons.star_border,
                       halfFilledIcon: Icons.star_half,
                       filledColor: MihColors.getYellowColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                       emptyColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       halfFilledColor: MihColors.getYellowColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                       // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                       isHalfAllowed: true,
-                  initialRating: widget.business.rating.isNotEmpty
+                      initialRating:
-                      ? double.parse(widget.business.rating)
+                          directoryProvider.selectedBusiness!.rating.isNotEmpty
+                              ? double.parse(
+                                  directoryProvider.selectedBusiness!.rating)
                               : 0,
                       maxRating: 5,
                     ),
@@ -200,17 +216,7 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                     SizedBox(
                       width: 700,
                       child: MihBusinessCard(
-                    business: widget.business,
+                        business: directoryProvider.selectedBusiness!,
-                    startUpSearch: widget.startUpSearch,
-                    // businessid: widget.business.business_id,
-                    // businessName: widget.business.Name,
-                    // cellNumber: widget.business.contact_no,
-                    // email: widget.business.bus_email,
-                    // gpsLocation: widget.business.gps_location,
-                    // rating: widget.business.rating.isNotEmpty
-                    //     ? double.parse(widget.business.rating)
-                    //     : 0,
-                    // website: widget.business.website,
                         width: width,
                       ),
                     ),
@@ -220,5 +226,7 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
             ),
           ],
         );
+      },
+    );
   }
 }

Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_qr_code.dart

@@ -25,11 +25,11 @@ import 'package:supertokens_flutter/supertokens.dart';
 
 class MihBusinessQrCode extends StatefulWidget {
   final Business business;
-  final String? startUpSearch;
+  // final String? startUpSearch;
   const MihBusinessQrCode({
     super.key,
     required this.business,
-    required this.startUpSearch,
+    // required this.startUpSearch,
   });
 
   @override

Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart

@@ -41,6 +41,7 @@ class _MihBusinessReviewsState extends State<MihBusinessReviews> {
           businessReview: businessReview,
           screenWidth: width,
           readOnly: true,
+          onSuccessDismissPressed: () {},
         );
       },
     );

Frontend/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile_view.dart

@@ -1,6 +1,4 @@
 import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
@@ -8,10 +6,8 @@ import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/personal_profi
 import 'package:flutter/material.dart';
 
 class MzansiProfileView extends StatefulWidget {
-  final AppUser user;
   const MzansiProfileView({
     super.key,
-    required this.user,
   });
 
   @override
@@ -42,13 +38,7 @@ class _MzansiProfileViewState extends State<MzansiProfileView> {
       icon: const Icon(Icons.arrow_back),
       iconSize: 35,
       onTap: () {
-        context.goNamed(
+        context.pop();
-          "mzansiDirectory",
-          extra: MzansiDirectoryArguments(
-            personalSearch: true,
-            startSearchText: widget.user.username,
-          ),
-        );
         FocusScope.of(context).unfocus();
       },
     );
@@ -69,9 +59,9 @@ class _MzansiProfileViewState extends State<MzansiProfileView> {
 
   List<Widget> getToolBody() {
     List<Widget> toolBodies = [];
-    toolBodies.add(MihPersonalProfileView(
+    toolBodies.add(
-      user: widget.user,
+      MihPersonalProfileView(),
-    ));
+    );
     return toolBodies;
   }
 

Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile_view.dart

@@ -1,6 +1,6 @@
 import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart';
@@ -8,12 +8,11 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 
 class MihPersonalProfileView extends StatefulWidget {
-  final AppUser user;
   const MihPersonalProfileView({
     super.key,
-    required this.user,
   });
 
   @override
@@ -32,8 +31,10 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
   @override
   void initState() {
     super.initState();
-    futureImageUrl =
+    MzansiDirectoryProvider directoryProvider =
-        MihFileApi.getMinioFileUrl(widget.user.pro_pic_path, context);
+        context.read<MzansiDirectoryProvider>();
+    futureImageUrl = MihFileApi.getMinioFileUrl(
+        directoryProvider.selectedUser!.pro_pic_path, context);
   }
 
   @override
@@ -48,9 +49,13 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
 
   Widget getBody(double width) {
     double profilePictureWidth = 150;
+    return Consumer<MzansiDirectoryProvider>(
+      builder: (BuildContext context, MzansiDirectoryProvider directoryProvider,
+          Widget? child) {
         return MihSingleChildScroll(
           child: Padding(
-        padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
+            padding:
+                MzansiInnovationHub.of(context)!.theme.screenType == "desktop"
                     ? EdgeInsets.symmetric(horizontal: width * 0.2)
                     : EdgeInsets.symmetric(horizontal: width * 0.075),
             child: Column(
@@ -59,7 +64,8 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                 FutureBuilder(
                     future: futureImageUrl,
                     builder: (context, asyncSnapshot) {
-                  if (asyncSnapshot.connectionState == ConnectionState.done &&
+                      if (asyncSnapshot.connectionState ==
+                              ConnectionState.done &&
                           asyncSnapshot.hasData) {
                         if (asyncSnapshot.requireData != "") {
                           return MihCircleAvatar(
@@ -94,60 +100,44 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                                   "Dark"),
                         );
                       }
-                  // return Center(
-                  //   child: MihCircleAvatar(
-                  //     imageFile: propicPreview,
-                  //     width: 150,
-                  //     editable: false,
-                  //     fileNameController: proPicController,
-                  //     userSelectedfile: proPic,
-                  //     frameColor: MzansiInnovationHub.of(context)!
-                  //         .theme
-                  //         .secondaryColor(),
-                  //     backgroundColor:
-                  //         MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  //     onChange: (selectedImage) {
-                  //       setState(() {
-                  //         proPic = selectedImage;
-                  //       });
-                  //     },
-                  //   ),
-                  // );
                     }),
                 FittedBox(
                   child: Text(
-                widget.user.username.isNotEmpty
+                    directoryProvider.selectedUser!.username.isNotEmpty
-                    ? widget.user.username
+                        ? directoryProvider.selectedUser!.username
                         : "Username",
                     style: TextStyle(
                       fontSize: 35,
                       fontWeight: FontWeight.bold,
                       color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                     ),
                   ),
                 ),
                 FittedBox(
                   child: Text(
-                widget.user.fname.isNotEmpty
+                    directoryProvider.selectedUser!.fname.isNotEmpty
-                    ? "${widget.user.fname} ${widget.user.lname}"
+                        ? "${directoryProvider.selectedUser!.fname} ${directoryProvider.selectedUser!.lname}"
                         : "Name Surname",
                     style: TextStyle(
                       fontSize: 25,
                       fontWeight: FontWeight.bold,
                       color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                     ),
                   ),
                 ),
                 FittedBox(
                   child: Text(
-                widget.user.type.toUpperCase(),
+                    directoryProvider.selectedUser!.type.toUpperCase(),
                     style: TextStyle(
                       fontSize: 15,
                       fontWeight: FontWeight.bold,
                       color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                     ),
                   ),
                 ),
@@ -156,44 +146,26 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                   child: SizedBox(
                     width: 700,
                     child: Text(
-                  widget.user.purpose.isNotEmpty
+                      directoryProvider.selectedUser!.purpose.isNotEmpty
-                      ? widget.user.purpose
+                          ? directoryProvider.selectedUser!.purpose
                           : "No Personal Mission added yet",
                       textAlign: TextAlign.center,
                       style: TextStyle(
                         fontSize: 15,
                         fontWeight: FontWeight.bold,
                         color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                       ),
                     ),
                   ),
                 ),
                 const SizedBox(height: 30.0),
-            // Center(
-            //   child: MihButton(
-            //     onPressed: () {
-            //       // Connect with the user
-            //     },
-            //     buttonColor:
-            //         MihColors.getGreenColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            //     width: 300,
-            //     child: Text(
-            //       widget.user.username.isEmpty
-            //           ? "Set Up Profile"
-            //           : "Edit Profile",
-            //       style: TextStyle(
-            //         color:
-            //             MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-            //         fontSize: 20,
-            //         fontWeight: FontWeight.bold,
-            //       ),
-            //     ),
-            //   ),
-            // ),
               ],
             ),
           ),
         );
+      },
+    );
   }
 }

Frontend/lib/mih_services/mih_mzansi_directory_services.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/bookmarked_business.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_review.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_directory_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
 import 'package:supertokens_flutter/http.dart' as http;
 
@@ -156,14 +157,17 @@ class MihMzansiDirectoryServices {
 
   Future<List<BookmarkedBusiness>> getAllUserBookmarkedBusiness(
     String app_id,
+    MzansiDirectoryProvider directoryProvider,
   ) async {
     final response = await http.get(Uri.parse(
         "${AppEnviroment.baseApiUrl}/mzansi-directory/bookmarked-business/user/all/$app_id/"));
     if (response.statusCode == 200) {
       Iterable l = jsonDecode(response.body);
-      List<BookmarkedBusiness> businessReviews = List<BookmarkedBusiness>.from(
+      List<BookmarkedBusiness> favouriteBusinesses =
+          List<BookmarkedBusiness>.from(
               l.map((model) => BookmarkedBusiness.fromJson(model)));
-      return businessReviews;
+      directoryProvider.setFavouriteBusinesses(businesses: favouriteBusinesses);
+      return favouriteBusinesses;
     } else if (response.statusCode == 404) {
       return [];
     } else {