diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart index 4e905377..790ac157 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart @@ -29,7 +29,7 @@ class _MzansiSetupBusinessProfileTileState arguments: widget.signedInUser, ); }, - appName: "Setup Business", + appName: "Set Up Business", appIcon: Icon( MihIcons.profileSetup, color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart index 9b7ce3f4..ce3a7209 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart @@ -41,6 +41,7 @@ class _MihPersonalProfileState extends State { final ValueNotifier _counter = ValueNotifier(0); PlatformFile? proPic; late ImageProvider? propicPreview; + late bool originalProfileTypeIsBusiness; late bool businessUser; late String oldProPicName; late String env; @@ -125,13 +126,18 @@ class _MihPersonalProfileState extends State { context, ); if (responseCode == 200) { + bool stayOnPersonalSide = true; + if (originalProfileTypeIsBusiness == false && businessUser == true) { + stayOnPersonalSide = false; + } Navigator.of(context).pop(); Navigator.of(context).pop(); Navigator.of(context).pop(); Navigator.of(context).pushNamed( '/', arguments: AuthArguments( - true, + stayOnPersonalSide, + // true, false, ), ); @@ -423,6 +429,11 @@ class _MihPersonalProfileState extends State { usernameController.text = widget.arguments.signedInUser.username; purposeController.text = widget.arguments.signedInUser.purpose; businessUser = isBusinessUser(); + if (businessUser) { + originalProfileTypeIsBusiness = true; + } else { + originalProfileTypeIsBusiness = false; + } }); }