From 7d94ef0bbdaa82fe12d6e9e48004df4638529241 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Mon, 29 Jul 2024 17:56:58 +0530
Subject: [PATCH] [mob][photos] Subscription page final UI tweaks

---
 mobile/lib/ui/payment/stripe_subscription_page.dart    | 8 ++++++++
 mobile/lib/ui/payment/subscription_common_widgets.dart | 4 ++--
 mobile/lib/ui/payment/subscription_plan_widget.dart    | 4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/mobile/lib/ui/payment/stripe_subscription_page.dart b/mobile/lib/ui/payment/stripe_subscription_page.dart
index 80087096ad..0f912f58e9 100644
--- a/mobile/lib/ui/payment/stripe_subscription_page.dart
+++ b/mobile/lib/ui/payment/stripe_subscription_page.dart
@@ -18,6 +18,7 @@ import 'package:photos/ui/common/progress_dialog.dart';
 import 'package:photos/ui/common/web_page.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import "package:photos/ui/components/captioned_text_widget.dart";
+import "package:photos/ui/components/divider_widget.dart";
 import "package:photos/ui/components/menu_item_widget/menu_item_widget.dart";
 import "package:photos/ui/components/title_bar_title_widget.dart";
 import 'package:photos/ui/payment/child_subscription_widget.dart';
@@ -235,7 +236,10 @@ class _StripeSubscriptionPageState extends State<StripeSubscriptionPage> {
           bonusData: _userDetails.bonusData,
         ),
       );
+      widgets.add(const DividerWidget(dividerType: DividerType.bottomBar));
+      widgets.add(const SizedBox(height: 20));
     } else {
+      widgets.add(const DividerWidget(dividerType: DividerType.bottomBar));
       const SizedBox(height: 56);
     }
 
@@ -376,6 +380,8 @@ class _StripeSubscriptionPageState extends State<StripeSubscriptionPage> {
       captionedTextWidget: CaptionedTextWidget(
         title: title,
       ),
+      alwaysShowSuccessState: false,
+      surfaceExecutionStates: false,
       menuItemColor: colorScheme.fillFaint,
       trailingWidget: Icon(
         Icons.chevron_right_outlined,
@@ -555,6 +561,7 @@ class _StripeSubscriptionPageState extends State<StripeSubscriptionPage> {
             period: plan.period,
             isActive: isActive && !_hideCurrentPlanSelection,
             isPopular: _isPopularPlan(plan),
+            isOnboarding: widget.isOnboarding,
           ),
         ),
       );
@@ -617,6 +624,7 @@ class _StripeSubscriptionPageState extends State<StripeSubscriptionPage> {
           price: _currentSubscription!.price,
           period: _currentSubscription!.period,
           isActive: _currentSubscription!.isValid(),
+          isOnboarding: widget.isOnboarding,
         ),
       ),
     );
diff --git a/mobile/lib/ui/payment/subscription_common_widgets.dart b/mobile/lib/ui/payment/subscription_common_widgets.dart
index 9f4b0d4305..5a1c95c563 100644
--- a/mobile/lib/ui/payment/subscription_common_widgets.dart
+++ b/mobile/lib/ui/payment/subscription_common_widgets.dart
@@ -41,7 +41,7 @@ class _SubscriptionHeaderWidgetState extends State<SubscriptionHeaderWidget> {
       );
     } else {
       return Padding(
-        padding: const EdgeInsets.fromLTRB(16, 16, 16, 0),
+        padding: const EdgeInsets.fromLTRB(16, 32, 16, 0),
         child: RichText(
           text: TextSpan(
             children: [
@@ -101,7 +101,7 @@ class ValidityWidget extends StatelessWidget {
     }
 
     return Padding(
-      padding: const EdgeInsets.fromLTRB(16, 47, 16, 72),
+      padding: const EdgeInsets.fromLTRB(16, 16, 16, 16),
       child: Column(
         children: [
           if (!hideSubValidityView)
diff --git a/mobile/lib/ui/payment/subscription_plan_widget.dart b/mobile/lib/ui/payment/subscription_plan_widget.dart
index 6f5f828e71..706fa6ae2b 100644
--- a/mobile/lib/ui/payment/subscription_plan_widget.dart
+++ b/mobile/lib/ui/payment/subscription_plan_widget.dart
@@ -12,6 +12,7 @@ class SubscriptionPlanWidget extends StatefulWidget {
     required this.storage,
     required this.price,
     required this.period,
+    required this.isOnboarding,
     this.isActive = false,
     this.isPopular = false,
   });
@@ -21,6 +22,7 @@ class SubscriptionPlanWidget extends StatefulWidget {
   final String period;
   final bool isActive;
   final bool isPopular;
+  final bool isOnboarding;
 
   @override
   State<SubscriptionPlanWidget> createState() => _SubscriptionPlanWidgetState();
@@ -60,7 +62,7 @@ class _SubscriptionPlanWidgetState extends State<SubscriptionPlanWidget> {
         ),
         child: Stack(
           children: [
-            widget.isActive
+            widget.isActive && !widget.isOnboarding
                 ? Positioned(
                     top: 0,
                     right: 0,