Merge pull request #934 from bannzai/fix/logic/ended-pill-sheet-annou…

…ncement EndedPillSheetの順番の優先度を上げる
bannzai · Sep 6, 2023 · 87cfd9d · 87cfd9d
2 parents 1e5504a + 9c5c19c
commit 87cfd9d
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/lib/features/record/components/announcement_bar/announcement_bar.dart b/lib/features/record/components/announcement_bar/announcement_bar.dart
@@ -75,6 +75,15 @@ class AnnouncementBar extends HookConsumerWidget {
         }
       }
 
+      if (latestPillSheetGroup != null && latestPillSheetGroup.activePillSheet == null) {
+        // ピルシートグループが存在していてactivedPillSheetが無い場合はピルシート終了が何かしらの理由がなくなったと見なし終了表示にする
+        return EndedPillSheet(
+          isPremium: premiumAndTrial.isPremium,
+          isTrial: premiumAndTrial.isTrial,
+          trialDeadlineDate: premiumAndTrial.trialDeadlineDate,
+        );
+      }
+
       if (premiumAndTrial.isTrial) {
         final premiumTrialLimit = PremiumTrialLimitAnnouncementBar.retrievePremiumTrialLimit(premiumAndTrial);
         if (premiumTrialLimit != null) {
@@ -106,15 +115,6 @@ class AnnouncementBar extends HookConsumerWidget {
             }
           }
         }
-
-        if (latestPillSheetGroup != null && latestPillSheetGroup.activePillSheet == null) {
-          // ピルシートグループが存在していてactivedPillSheetが無い場合はピルシート終了が何かしらの理由がなくなったと見なし終了表示にする
-          return EndedPillSheet(
-            isPremium: premiumAndTrial.isPremium,
-            isTrial: premiumAndTrial.isTrial,
-            trialDeadlineDate: premiumAndTrial.trialDeadlineDate,
-          );
-        }
       } else {
         if (!isAdsDisabled && pilllAds != null) {
           return PilllAdsAnnouncementBar(pilllAds: pilllAds, onClose: () => showPremiumIntroductionSheet(context));