fix: Fix eneterpise wallet naming bug #2498

TalaoDAO · Apr 16, 2024 · f0dfa22 · f0dfa22
1 parent 72fc2b4
commit f0dfa22
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/lib/dashboard/drawer/profile/widget/profile_selector_widget.dart b/lib/dashboard/drawer/profile/widget/profile_selector_widget.dart
@@ -13,6 +13,12 @@ class ProfileSelectorWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final l10n = context.l10n;
+
+    final profile = context.read<ProfileCubit>().state.model;
+
+    final walletContainsEnterpriseProfile =
+        profile.walletType == WalletType.enterprise;
+
     return BlocBuilder<ProfileCubit, ProfileState>(
       builder: (context, state) {
         return Column(
@@ -53,15 +59,11 @@ class ProfileSelectorWidget extends StatelessWidget {
                     itemBuilder: (context, index) {
                       final profileType = ProfileType.values[index];
 
-                      final profile = context.read<ProfileCubit>().state.model;
-
-                      final isEnterprise =
-                          profile.walletType == WalletType.enterprise;
-
-                      if (!isEnterprise &&
+                      if (!walletContainsEnterpriseProfile &&
                           profileType == ProfileType.enterprise) {
                         return Container();
                       }
+
                       return Column(
                         children: [
                           if (index != 0)

diff --git a/lib/dashboard/profile/cubit/profile_cubit.dart b/lib/dashboard/profile/cubit/profile_cubit.dart
@@ -144,6 +144,23 @@ class ProfileCubit extends Cubit<ProfileState> {
         }
       }
 
+      String? enterpriseWalletName;
+
+      final enterpriseProfileSettingJsonString =
+          await secureStorageProvider.get(
+        SecureStorageKeys.enterpriseProfileSetting,
+      );
+
+      if (enterpriseProfileSettingJsonString != null) {
+        final ProfileSetting enterpriseProfileSetting = ProfileSetting.fromJson(
+          json.decode(enterpriseProfileSettingJsonString)
+              as Map<String, dynamic>,
+        );
+
+        enterpriseWalletName =
+            enterpriseProfileSetting.generalOptions.profileName;
+      }
+
       /// profileSetting
       late ProfileSetting profileSetting;
 
@@ -172,6 +189,7 @@ class ProfileCubit extends Cubit<ProfileState> {
             isDeveloperMode: isDeveloperMode,
             profileType: profileType,
             profileSetting: profileSetting,
+            enterpriseWalletName: enterpriseWalletName,
           );
 
         case ProfileType.defaultOne:
@@ -193,6 +211,7 @@ class ProfileCubit extends Cubit<ProfileState> {
             isDeveloperMode: isDeveloperMode,
             clientId: did,
             clientSecret: randomString(12),
+            enterpriseWalletName: enterpriseWalletName,
           );
 
         case ProfileType.ebsiV3:
@@ -214,6 +233,7 @@ class ProfileCubit extends Cubit<ProfileState> {
             isDeveloperMode: isDeveloperMode,
             clientId: did,
             clientSecret: randomString(12),
+            enterpriseWalletName: enterpriseWalletName,
           );
 
         case ProfileType.dutch:
@@ -235,6 +255,7 @@ class ProfileCubit extends Cubit<ProfileState> {
             isDeveloperMode: isDeveloperMode,
             clientId: did,
             clientSecret: randomString(12),
+            enterpriseWalletName: enterpriseWalletName,
           );
 
         case ProfileType.owfBaselineProfile:
@@ -256,14 +277,10 @@ class ProfileCubit extends Cubit<ProfileState> {
             isDeveloperMode: isDeveloperMode,
             clientId: did,
             clientSecret: randomString(12),
+            enterpriseWalletName: enterpriseWalletName,
           );
 
         case ProfileType.enterprise:
-          final enterpriseProfileSettingJsonString =
-              await secureStorageProvider.get(
-            SecureStorageKeys.enterpriseProfileSetting,
-          );
-
           if (enterpriseProfileSettingJsonString != null) {
             profileSetting = ProfileSetting.fromJson(
               json.decode(enterpriseProfileSettingJsonString)