Merge branch 'Sang/fix/quick_fixes_round3' into release/08.11

bitmark-inc · Nov 8, 2024 · 1a1464f · 1a1464f
2 parents 286e09a + be8802b
commit 1a1464f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 23 deletions.
diff --git a/lib/screen/feralfile_home/artwork_view.dart b/lib/screen/feralfile_home/artwork_view.dart
@@ -69,9 +69,8 @@ class ExploreSeriesViewState extends State<ExploreSeriesView> {
   @override
   void didUpdateWidget(covariant ExploreSeriesView oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (!oldWidget.isEqual(widget) || true) {
-      unawaited(_fetchSeries(context));
-    }
+    unawaited(_fetchSeries(context));
+    scrollToTop();
   }
 
   @override

diff --git a/lib/screen/feralfile_home/feralfile_home.dart b/lib/screen/feralfile_home/feralfile_home.dart
@@ -27,8 +27,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 
 enum FeralfileHomeTab {
   exhibitions,
-  artworks,
   featured,
+  artworks,
   artists,
   curators,
   rAndD;
@@ -244,16 +244,6 @@ class FeralfileHomePageState extends State<FeralfileHomePage>
           _selectTab(FeralfileHomeTab.exhibitions);
         },
       ),
-      Item(
-        id: FeralfileHomeTab.artworks.index.toString(),
-        title: '_artworks'.tr(),
-        subtitle: state.exploreStatisticsData != null
-            ? numberFormater.format(state.exploreStatisticsData!.totalArtwork)
-            : '-',
-        onSelected: () {
-          _selectTab(FeralfileHomeTab.artworks);
-        },
-      ),
       Item(
         id: FeralfileHomeTab.featured.index.toString(),
         title: 'featured'.tr(),
@@ -264,6 +254,16 @@ class FeralfileHomePageState extends State<FeralfileHomePage>
           _selectTab(FeralfileHomeTab.featured);
         },
       ),
+      Item(
+        id: FeralfileHomeTab.artworks.index.toString(),
+        title: '_artworks'.tr(),
+        subtitle: state.exploreStatisticsData != null
+            ? numberFormater.format(state.exploreStatisticsData!.totalArtwork)
+            : '-',
+        onSelected: () {
+          _selectTab(FeralfileHomeTab.artworks);
+        },
+      ),
       Item(
           id: FeralfileHomeTab.artists.index.toString(),
           title: 'artists'.tr(),

diff --git a/lib/screen/feralfile_home/list_alumni_view.dart b/lib/screen/feralfile_home/list_alumni_view.dart
@@ -57,9 +57,8 @@ class ExploreArtistViewState extends State<ExploreArtistView> {
   @override
   void didUpdateWidget(covariant ExploreArtistView oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (!oldWidget.isEqual(widget) || true) {
-      unawaited(_fetchArtists(context));
-    }
+    unawaited(_fetchArtists(context));
+    scrollToTop();
   }
 
   @override
@@ -206,9 +205,8 @@ class ExploreCuratorViewState extends State<ExploreCuratorView> {
   @override
   void didUpdateWidget(covariant ExploreCuratorView oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (!oldWidget.isEqual(widget) || true) {
-      unawaited(_fetchCurators(context));
-    }
+    unawaited(_fetchCurators(context));
+    scrollToTop();
   }
 
   @override

diff --git a/lib/screen/feralfile_home/list_exhibition_view.dart b/lib/screen/feralfile_home/list_exhibition_view.dart
@@ -54,9 +54,8 @@ class ExploreExhibitionState extends State<ExploreExhibition> {
   @override
   void didUpdateWidget(covariant ExploreExhibition oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (!oldWidget.isEqual(widget) || true) {
-      unawaited(_fetchExhibitions(context));
-    }
+    unawaited(_fetchExhibitions(context));
+    scrollToTop();
   }
 
   void scrollToTop() {