From 38b41bf96fad73508665a06137622d4d618322ea Mon Sep 17 00:00:00 2001
From: Saksham Mahajan <saksham.mahajan@navi.com>
Date: Wed, 3 Jul 2024 19:12:48 +0530
Subject: [PATCH] Revert "NTP-43 | Amc regression fixes" (#11672)

---
 .../common/fragment/OrderStatusFragment.kt    |  2 +-
 .../main/res/layout/order_status_layout.xml   | 47 +++++++++----------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt b/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt
index ba4bfc3568..8955010eda 100644
--- a/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt
+++ b/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt
@@ -446,7 +446,7 @@ class OrderStatusFragment :
         binding.rewardLottie.isVisible = true
         viewModel.setRewardLottieVisibility(true)
 
-        setSpringAnimation(binding.rewardLottie, 300, 250)
+        setSpringAnimation(binding.rewardLottie, 400, 250)
 
         // Start the Lottie animation
         binding.rewardLottie.setAnimation(lottieUrl)
diff --git a/android/navi-amc/src/main/res/layout/order_status_layout.xml b/android/navi-amc/src/main/res/layout/order_status_layout.xml
index 4cc40c6345..45d71e7139 100644
--- a/android/navi-amc/src/main/res/layout/order_status_layout.xml
+++ b/android/navi-amc/src/main/res/layout/order_status_layout.xml
@@ -130,29 +130,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/learn_more_note"
-                    tools:visibility="gone" />
-
-                <com.airbnb.lottie.LottieAnimationView
-                    android:id="@+id/rewardLottie"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="@dimen/dp_16"
-                    android:layout_marginTop="@dimen/dp_16"
-                    android:scaleType="fitXY"
-                    android:visibility="gone"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/status_note" />
-
-                <include
-                    android:id="@+id/reward_text"
-                    layout="@layout/reward_text"
-                    android:layout_marginHorizontal="@dimen/dp_16"
-                    android:layout_marginTop="@dimen/dp_16"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/rewardLottie" />
+                    tools:visibility="visible" />
 
                 <include
                     android:id="@+id/nudge_banner"
@@ -165,9 +143,30 @@
                     android:layout_marginBottom="@dimen/dp_16"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/reward_text"
+                    app:layout_constraintTop_toBottomOf="@id/order_update"
                     app:layout_constraintBottom_toBottomOf="parent"/>
 
+                <com.airbnb.lottie.LottieAnimationView
+                    android:id="@+id/rewardLottie"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_16"
+                    android:layout_marginTop="@dimen/dp_16"
+                    android:scaleType="fitXY"
+                    android:visibility="gone"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/nudge_banner" />
+
+                <include
+                    android:id="@+id/reward_text"
+                    layout="@layout/reward_text"
+                    android:layout_marginHorizontal="@dimen/dp_16"
+                    android:layout_marginTop="@dimen/dp_16"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/nudge_banner" />
 
 
             </androidx.constraintlayout.widget.ConstraintLayout>