fix(quick): UI fixes round 2

lib/common/injector.dart

@@ -103,6 +103,8 @@ import 'package:web3dart/web3dart.dart';
 final injector = GetIt.instance;
 final testnetInjector = GetIt.asNewInstance();
 
+const iapApiTimeout5secInstanceName = 'iapApiTimeout5sec';
+
 Future<void> setupLogger() async {
   await FileLogger.initializeLogging();
 
@@ -212,6 +214,11 @@ Future<void> setupInjector() async {
   injector.registerLazySingleton(() => ChatAuthService(injector()));
   injector.registerLazySingleton(
       () => IAPApi(authenticatedDio, baseUrl: Environment.autonomyAuthURL));
+
+  injector.registerLazySingleton(
+      () => IAPApi(dio, baseUrl: Environment.autonomyAuthURL),
+      instanceName: iapApiTimeout5secInstanceName);
+
   injector.registerLazySingleton(
       () => UserApi(dio, baseUrl: Environment.autonomyAuthURL));
 

lib/model/additional_data/additional_data.dart

@@ -41,7 +41,7 @@ class AdditionalData {
             return defaultAdditionalData;
           }
           return CsViewThread(
-            issueId: issueId,
+            issueId: issueId.toString(),
             notificationType: notificationType,
             announcementContentId: announcementContentId,
           );

lib/screen/alumni_details/alumni_details_page.dart

@@ -200,12 +200,16 @@ class _AlumniDetailsPageState extends State<AlumniDetailsPage> {
             height: 24,
           ),
         ],
-        if (alumni.website != null && alumni.website!.isNotEmpty) ...[
-          _alumniUrl(context, alumni.website!),
-          const SizedBox(
-            height: 12,
-          ),
-        ],
+        if (alumni.websiteUrl.isNotEmpty)
+          ...alumni.websiteUrl
+              .map((url) => [
+                    _alumniUrl(context, url),
+                    const SizedBox(
+                      height: 12,
+                    )
+                  ])
+              .expand((element) => element),
+
         if (alumni.instagramUrl != null && alumni.instagramUrl!.isNotEmpty) ...[
           _alumniUrl(context, alumni.instagramUrl!, title: 'instagram'.tr()),
           const SizedBox(

lib/screen/customer_support/support_thread_page.dart

@@ -222,7 +222,7 @@ class _SupportThreadPageState extends State<SupportThreadPage> {
           });
         }
       case NewIssueFromAnnouncementPayload:
-        _reportIssueType = ReportIssueType.Announcement;
+        _reportIssueType = ReportIssueType.ChatWithFeralfile;
       case DetailIssuePayload:
         _reportIssueType = (payload as DetailIssuePayload).reportIssueType;
         _status = payload.status;

lib/screen/feralfile_home/feralfile_home.dart

@@ -26,9 +26,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 enum FeralfileHomeTab {
-  featured,
-  artworks,
   exhibitions,
+  artworks,
+  featured,
   artists,
   curators,
   rAndD;
@@ -127,7 +127,7 @@ class FeralfileHomePageState extends State<FeralfileHomePage>
     super.initState();
     _canvasDeviceBloc = injector.get<CanvasDeviceBloc>();
     context.read<FeralfileHomeBloc>().add(FeralFileHomeFetchDataEvent());
-    _selectedIndex = FeralfileHomeTab.featured.index;
+    _selectedIndex = FeralfileHomeTab.exhibitions.index;
   }
 
   Widget _castButton(BuildContext context, List<Artwork> featuredArtworks) {
@@ -234,13 +234,14 @@ class FeralfileHomePageState extends State<FeralfileHomePage>
     final numberFormater = NumberFormat('#,###', 'en_US');
     return [
       Item(
-        id: FeralfileHomeTab.featured.index.toString(),
-        title: 'featured'.tr(),
-        subtitle: state.featuredArtworks != null
-            ? numberFormater.format(state.featuredArtworks!.length)
+        id: FeralfileHomeTab.exhibitions.index.toString(),
+        title: 'exhibitions'.tr(),
+        subtitle: state.exploreStatisticsData != null
+            ? numberFormater
+                .format(state.exploreStatisticsData!.totalExhibition)
             : '-',
         onSelected: () {
-          _selectTab(FeralfileHomeTab.featured);
+          _selectTab(FeralfileHomeTab.exhibitions);
         },
       ),
       Item(
@@ -254,14 +255,13 @@ class FeralfileHomePageState extends State<FeralfileHomePage>
         },
       ),
       Item(
-        id: FeralfileHomeTab.exhibitions.index.toString(),
-        title: 'exhibitions'.tr(),
-        subtitle: state.exploreStatisticsData != null
-            ? numberFormater
-                .format(state.exploreStatisticsData!.totalExhibition)
+        id: FeralfileHomeTab.featured.index.toString(),
+        title: 'featured'.tr(),
+        subtitle: state.featuredArtworks != null
+            ? numberFormater.format(state.featuredArtworks!.length)
             : '-',
         onSelected: () {
-          _selectTab(FeralfileHomeTab.exhibitions);
+          _selectTab(FeralfileHomeTab.featured);
         },
       ),
       Item(

lib/service/iap_service.dart

@@ -375,7 +375,9 @@ class IAPServiceImpl implements IAPService {
   @override
   Future<String> getStripeUrl() async {
     try {
-      final res = await injector<IAPApi>().portalUrl() as Map<String, dynamic>;
+      final res =
+          await injector<IAPApi>(instanceName: iapApiTimeout5secInstanceName)
+              .portalUrl() as Map<String, dynamic>;
       return res['url'] as String;
     } catch (error) {
       log.warning('Error when getting stripe portal url: $error');

lib/util/constants.dart

@@ -286,9 +286,10 @@ class ReportIssueType {
   static const Exception = 'exception';
   static const Announcement = 'announcement';
   static const MerchandiseIssue = 'merchandise postcard';
+  static const ChatWithFeralfile = 'chat with Feral File';
 
   static List<String> get getList =>
-      [Bug, Exception, Announcement, MerchandiseIssue];
+      [Bug, Exception, Announcement, MerchandiseIssue, ChatWithFeralfile];
 
   static List<String> get getSuggestList => [Bug];
 
@@ -298,6 +299,8 @@ class ReportIssueType {
         return 'Report a bug';
       case Announcement:
         return 'announcement'.tr();
+      case ChatWithFeralfile:
+        return 'chat_with_feralfile'.tr();
       case MerchandiseIssue:
         return 'Merchandise issue';
       case Bug:

lib/util/feralfile_alumni_ext.dart

@@ -10,6 +10,20 @@ extension AlumniAccountExt on AlumniAccount {
       ? getFFUrl(avatarURI!)
       : null;
 
+  List<String> get websiteUrl {
+    final listRawWebsite =
+        website?.split('&').map((e) => e.trim()).where((e) => e.isNotEmpty) ??
+            [];
+    final listWebsite = listRawWebsite.map((e) {
+      if (e.startsWith('http')) {
+        return e;
+      }
+
+      return 'http://$e';
+    }).toList();
+    return listWebsite;
+  }
+
   String? get instagramUrl {
     final instagramID = socialNetworks?.instagramID;
     if (instagramID == null || instagramID.isEmpty) {

lib/view/alumni_widget.dart

@@ -117,12 +117,15 @@ class AlumniProfile extends StatelessWidget {
             height: 24,
           ),
         ],
-        if (alumni.website != null && alumni.website!.isNotEmpty) ...[
-          _alumniUrl(context, alumni.website!),
-          const SizedBox(
-            height: 12,
-          ),
-        ],
+        if (alumni.websiteUrl.isNotEmpty)
+          ...alumni.websiteUrl
+              .map((url) => [
+                    _alumniUrl(context, url),
+                    const SizedBox(
+                      height: 12,
+                    )
+                  ])
+              .expand((element) => element),
         if (alumni.instagramUrl != null && alumni.instagramUrl!.isNotEmpty) ...[
           _alumniUrl(context, alumni.instagramUrl!, title: 'Instagram'),
           const SizedBox(

lib/view/ff_exhibition_participants.dart

@@ -38,13 +38,13 @@ List<TextSpan> exhibitionParticipantSpans(List<AlumniAccount> participants) {
                       .openFeralFileCuratorPage(alumni.slug!)
                   : injector<NavigationService>()
                       .openFeralFileArtistPage(alumni.slug!));
-            } else if (alumni.website != null) {
-              await launchUrl(Uri.parse(alumni.website!));
+            } else if (alumni.websiteUrl.isNotEmpty) {
+              await launchUrl(Uri.parse(alumni.websiteUrl.first));
             }
           },
         text: alumni.displayAlias,
         style: TextStyle(
-          decoration: alumni.slug != null || alumni.website != null
+          decoration: alumni.slug != null || alumni.websiteUrl.isNotEmpty
               ? TextDecoration.underline
               : TextDecoration.none,
         ),