From e48b578b5369a539c5966e01fcb580231f3ed1ea Mon Sep 17 00:00:00 2001
From: Preyea Regmi <preyearegmi@outlook.com>
Date: Wed, 6 May 2020 22:14:15 +0545
Subject: [PATCH] Txn receipt logo added

---
 .idea/caches/build_file_checksums.ser         |  Bin 662 -> 662 bytes
 .idea/misc.xml                                |    2 +-
 ...ity_send_money_v2_transaction_complete.xml | 1168 +++++++++--------
 3 files changed, 603 insertions(+), 567 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index a606d8ed3451eb58eaa879028ef205ef794edd19..ff26f7660f591c02ec4fdb548b6a175450168d7a 100644
GIT binary patch
delta 309
zcmbQnI*oP0Oy(mo2Pe+)H|H--Eh)*&OE1<-FG@_wNi8j6V2XBH^I7}{8%M|kCI*Iz
z0tN;K0na-U;iYlv4+{50zpu|Ke>d5mQBoi?;XGTI^se^ZJ1-ddrar$vc^{*!fcMU9
z=h)cKt7=}G@iQEXh?`u&DDR-3RGOKS0<)r!p^kwKWa{hSzT<7@Sh{%Tw6RETSf)_I
zpspWUoLW?@UtFG<R${0R)uBJxhDp~_x;Qntv?#NrGCQ@hATb4pnM~o6{_I=2$a{zK
z(tXcwZhKI|APCegZI}DTd`g$oW-dkL4I4b?Ufx*3Adpy4fWwfOZoc1wxkBuV-hABF
J^~lw?0stt)btnJ;

delta 280
zcmbQnI*oP0OlGU|=O@nbPZvlmD2Pca&CE&BOD{@H$w@6OVql7PTJu@_2OCGo111KB
ziUI}(27#d68#nkbt`pfl@r&-(-&60DFz^?rmXu`Xr5D3A7BbW^uz}PHdUAaKyDs$W
z|6?~?CaGs-moV^5&Sw%65Ma;Cv=V50Ubnm0k#~`#;N%KMdBzy9R7Lk{b4iu`XOhb9
zyxf!|xpuNQqpXt4&nX92>Be9Ct;*6DP!j*6gh9GEHMz7Xv!pURwXz^F1*}(-d9p*z
zgrrpaN!kljqB^ruOBmFhtztrpQ;UjY{PN2ZW1tR<nQY4>J^2%(&}17X8Nm&ECv3c=
Q_g>Ag@VjYky~nEx02Lx^r2qf`

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 974f06ab..f5c6d9eb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml b/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
index aa1c0944..461621d7 100644
--- a/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
+++ b/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
@@ -13,644 +13,680 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <LinearLayout
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/background_gray"
+        android:orientation="vertical">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/relativeLayout4"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/background_gray"
-            android:orientation="vertical">
+            android:layout_margin="@dimen/_8sdp"
+            android:background="@drawable/ic_recharge_share_background">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/relativeLayout4"
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/_14sdp"
+                android:src="@drawable/ic_gme_logo_white"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:id="@+id/imageView6"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="66dp"
+                android:padding="@dimen/_11sdp"
+                android:src="@drawable/ic_share_image"
+                android:visibility="gone"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:id="@+id/transfer_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/_6sdp"
+                android:layout_marginEnd="@dimen/_6sdp"
+                android:padding="@dimen/_4sdp"
+                android:text="@string/transfer_success_text"
+                android:textColor="@color/white"
+                android:textSize="@dimen/_14ssp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/logo"
+                app:txtfontName="@string/semibold" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:id="@+id/tv_receiver_name"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/_6sdp"
+                android:layout_marginEnd="@dimen/_6sdp"
+                android:gravity="center_horizontal"
+                android:padding="@dimen/_1sdp"
+                android:textColor="@color/white"
+                android:textSize="@dimen/_12ssp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/transfer_detail"
+                app:txtfontName="@string/heavy"
+                tools:text="Some name" />
+
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:id="@+id/gmeTextView8"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/_6sdp"
+                android:layout_marginTop="@dimen/_6sdp"
+                android:layout_marginEnd="@dimen/_6sdp"
+                android:padding="@dimen/_1sdp"
+                android:paddingStart="@dimen/_4sdp"
+                android:paddingEnd="@dimen/_4sdp"
+                android:text="@string/total_payout_amount_text"
+                android:textColor="@color/white"
+                android:textSize="@dimen/_12ssp"
+                app:layout_constraintEnd_toStartOf="@+id/tv_payout_amount"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_receiver_name" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:id="@+id/tv_payout_amount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/_6sdp"
+                android:padding="2dp"
+                android:textColor="@color/white"
+                android:textSize="@dimen/_11ssp"
+                app:layout_constraintBaseline_toBaselineOf="@+id/gmeTextView8"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toEndOf="@+id/gmeTextView8"
+                app:txtfontName="@string/semibold"
+                tools:text="50000" />
+
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:id="@+id/tv_gme_control_no"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/_8sdp"
-                android:background="@drawable/ic_recharge_share_background">
+                android:layout_marginTop="@dimen/_6sdp"
+                android:gravity="center_horizontal"
+                android:padding="@dimen/_1sdp"
+                android:textColor="@color/white"
+                android:textSize="@dimen/_14ssp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_payout_amount"
+                app:txtfontName="@string/heavy"
+                tools:text="1209389128379128" />
 
-                <ImageView
-                    android:id="@+id/logo"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_14sdp"
-                    android:src="@drawable/ic_gme_logo_white"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:id="@+id/transfer_detail"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/_6sdp"
+                android:layout_marginEnd="@dimen/_6sdp"
+                android:gravity="center_horizontal"
+                android:padding="@dimen/_1sdp"
+                android:paddingStart="@dimen/_4sdp"
+                android:paddingEnd="@dimen/_4sdp"
+                android:text="@string/transfer_success_info_text"
+                android:textColor="@color/white"
+                android:textSize="@dimen/_12ssp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/transfer_label" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/container_partner_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toEndOf="@+id/imageView7"
+                app:layout_constraintTop_toBottomOf="@+id/tv_gme_control_no">
+                <!--                    >-->
+                <!--                    <ImageView-->
+                <!--                        android:layout_marginTop="@dimen/_10sdp"-->
+                <!--                        android:visibility="gone"-->
+                <!--                        android:id="@+id/img_partner_info"-->
+                <!--                        app:layout_constraintStart_toStartOf="parent"-->
+                <!--                        app:layout_constraintEnd_toEndOf="parent"-->
+                <!--                        app:layout_constraintTop_toTopOf="parent"-->
+                <!--                        app:layout_constraintBottom_toTopOf="@+id/txt_partner_info"-->
+                <!--                        android:layout_width="0dp"-->
+                <!--                        app:layout_constraintDimensionRatio="H,3:1"-->
+                <!--                        android:layout_height="0dp"/>-->
+                <!--                    <ProgressBar-->
+                <!--                        android:id="@+id/progressbar_partner_info"-->
+                <!--                        android:layout_width="@dimen/_18sdp"-->
+                <!--                        android:layout_height="@dimen/_18sdp"-->
+                <!--                        android:layout_marginBottom="@dimen/_20sdp"-->
+                <!--                        android:layout_marginTop="@dimen/_20sdp"-->
+                <!--                        app:layout_constraintStart_toStartOf="parent"-->
+                <!--                        app:layout_constraintEnd_toEndOf="parent"-->
+                <!--                        app:layout_constraintTop_toTopOf="parent"-->
+                <!--                        app:layout_constraintBottom_toBottomOf="parent"/>-->
+
+<!--                <ProgressBar-->
+<!--                    android:id="@+id/progressbar_partner_info"-->
+<!--                    android:layout_width="@dimen/_18sdp"-->
+<!--                    android:layout_height="@dimen/_18sdp"-->
+<!--                    android:layout_marginTop="@dimen/_20sdp"-->
+<!--                    android:layout_marginBottom="@dimen/_20sdp"-->
+<!--                    app:layout_constraintBottom_toBottomOf="parent"-->
+<!--                    app:layout_constraintEnd_toEndOf="parent"-->
+<!--                    app:layout_constraintStart_toStartOf="parent"-->
+<!--                    app:layout_constraintTop_toTopOf="parent" />-->
 
                 <ImageView
-                    android:id="@+id/imageView6"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginTop="66dp"
-                    android:padding="@dimen/_11sdp"
-                    android:src="@drawable/ic_share_image"
-                    android:visibility="gone"
+                    android:scaleType="fitCenter"
+                    android:id="@+id/img_partner_info"
+                    android:layout_width="@dimen/_60sdp"
+                    android:layout_height="@dimen/_60sdp"
+                    android:layout_marginStart="@dimen/_8sdp"
+                    android:layout_marginEnd="@dimen/_8sdp"
+                    android:layout_marginTop="@dimen/_10sdp"
+                    android:visibility="visible"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/txt_partner_info"
+                    app:layout_constraintHorizontal_bias="0.5"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:id="@+id/transfer_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/_6sdp"
-                    android:layout_marginEnd="@dimen/_6sdp"
-                    android:padding="@dimen/_4sdp"
-                    android:text="@string/transfer_success_text"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/_14ssp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/logo"
-                    app:txtfontName="@string/semibold" />
+                <ProgressBar
+                    android:id="@+id/progressbar_partner_info"
+                    android:layout_width="@dimen/_18sdp"
+                    android:layout_height="@dimen/_18sdp"
+                    android:layout_marginTop="@dimen/_20sdp"
+                    android:layout_marginBottom="@dimen/_20sdp"
+                    app:layout_constraintBottom_toBottomOf="@+id/img_partner_info"
+                    app:layout_constraintEnd_toEndOf="@+id/img_partner_info"
+                    app:layout_constraintStart_toStartOf="@+id/img_partner_info"
+                    app:layout_constraintTop_toTopOf="@+id/img_partner_info" />
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:id="@+id/tv_receiver_name"
+                    android:id="@+id/txt_partner_info"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/_6sdp"
-                    android:layout_marginEnd="@dimen/_6sdp"
-                    android:gravity="center_horizontal"
-                    android:padding="@dimen/_1sdp"
+                    android:layout_marginTop="@dimen/_10sdp"
+                    android:layout_marginEnd="@dimen/_8sdp"
+                    android:layout_marginStart="@dimen/_8sdp"
+                    android:gravity="center"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/_12ssp"
+                    android:textSize="@dimen/_9ssp"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/transfer_detail"
-                    app:txtfontName="@string/heavy"
-                    tools:text="Some name" />
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/img_partner_info"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="International Money Transfer" />
 
 
-                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:id="@+id/gmeTextView8"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/_6sdp"
-                    android:layout_marginTop="@dimen/_6sdp"
-                    android:layout_marginEnd="@dimen/_6sdp"
-                    android:padding="@dimen/_1sdp"
-                    android:paddingStart="@dimen/_4sdp"
-                    android:paddingEnd="@dimen/_4sdp"
-                    android:text="@string/total_payout_amount_text"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/_12ssp"
-                    app:layout_constraintEnd_toStartOf="@+id/tv_payout_amount"
-                    app:layout_constraintHorizontal_bias="0.5"
-                    app:layout_constraintHorizontal_chainStyle="packed"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tv_receiver_name" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
-                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:id="@+id/tv_payout_amount"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="@dimen/_6sdp"
-                    android:padding="2dp"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/_11ssp"
-                    app:layout_constraintBaseline_toBaselineOf="@+id/gmeTextView8"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.5"
-                    app:layout_constraintStart_toEndOf="@+id/gmeTextView8"
-                    app:txtfontName="@string/semibold"
-                    tools:text="50000" />
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+            android:id="@+id/tv_note"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/_6sdp"
+            android:gravity="center"
+            android:paddingStart="@dimen/_4sdp"
+            android:paddingTop="@dimen/_2sdp"
+            android:paddingEnd="@dimen/_4sdp"
+            android:paddingBottom="@dimen/_4sdp"
+            android:text="@string/gme_control_security_text"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_10ssp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/imageView7"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/container_partner_info" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/_8sdp"
+        android:background="@drawable/ic_rectangle_white_extra_corners">
 
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/_8sdp"
+            android:text="@string/transaction_date_text"
+            android:textColor="@color/darkgray"
+            android:textSize="@dimen/_11ssp" />
+
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+            android:id="@+id/transaction_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:padding="@dimen/_8sdp"
+            android:textColor="@color/darkgray"
+            android:textSize="@dimen/_11ssp"
+            app:txtfontName="@string/semibold" />
 
-                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:id="@+id/tv_gme_control_no"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_6sdp"
-                    android:gravity="center_horizontal"
-                    android:padding="@dimen/_1sdp"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/_14ssp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tv_payout_amount"
-                    app:txtfontName="@string/heavy"
-                    tools:text="1209389128379128" />
 
+    </RelativeLayout>
 
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/_8sdp"
+        android:background="@drawable/ic_rectangle_white_extra_corners">
 
+        <LinearLayout
+            android:id="@+id/nameContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="1">
 
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/_8sdp"
+                android:text="@string/receiver_text"
+                android:textColor="@color/darkgray"
+                android:textSize="@dimen/_11ssp" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:id="@+id/tv_receiver"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="end"
+                android:padding="@dimen/_8sdp"
+                android:textColor="@color/darkgray"
+                android:textSize="@dimen/_11ssp"
+                app:txtfontName="@string/semibold" />
+        </LinearLayout>
 
-                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:id="@+id/transfer_detail"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/_6sdp"
-                    android:layout_marginEnd="@dimen/_6sdp"
-                    android:gravity="center_horizontal"
-                    android:padding="@dimen/_1sdp"
-                    android:paddingStart="@dimen/_4sdp"
-                    android:paddingEnd="@dimen/_4sdp"
-                    android:text="@string/transfer_success_info_text"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/_12ssp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/transfer_label" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/nameContainer"
+            android:background="@color/gray" />
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/container_partner_info"
-                    android:layout_width="match_parent"
-                    android:visibility="gone"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.5"
-                    app:layout_constraintStart_toEndOf="@+id/imageView7"
-                    app:layout_constraintTop_toBottomOf="@+id/tv_gme_control_no"
-                    >
-                    <ImageView
-                        android:layout_marginTop="@dimen/_10sdp"
-                        android:visibility="gone"
-                        android:id="@+id/img_partner_info"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintBottom_toTopOf="@+id/txt_partner_info"
-                        android:layout_width="0dp"
-                        app:layout_constraintDimensionRatio="H,3:1"
-                        android:layout_height="0dp"/>
-                    <ProgressBar
-                        android:id="@+id/progressbar_partner_info"
-                        android:layout_width="@dimen/_18sdp"
-                        android:layout_height="@dimen/_18sdp"
-                        android:layout_marginBottom="@dimen/_20sdp"
-                        android:layout_marginTop="@dimen/_20sdp"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintBottom_toBottomOf="parent"/>
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:id="@+id/txt_partner_info"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/_9ssp"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        tools:text="International Money Transfer" />
-
-
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+            android:id="@+id/receiver_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/nameContainer"
+            android:padding="@dimen/_8sdp"
+            android:text="@string/address_text"
+            android:textColor="@color/darkgray"
+            android:textSize="@dimen/_11ssp" />
+
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+            android:id="@+id/tv_address"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/nameContainer"
+            android:layout_alignParentRight="true"
+            android:maxLength="25"
+            android:padding="@dimen/_8sdp"
+            android:singleLine="true"
+            android:textColor="@color/darkgray"
+            android:textSize="@dimen/_11ssp"
+            app:txtfontName="@string/semibold" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/receiver_label"
+            android:background="@color/gray" />
 
-                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:id="@+id/tv_note"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/_6sdp"
-                    android:gravity="center"
-                    android:paddingStart="@dimen/_4sdp"
-                    android:paddingTop="@dimen/_2sdp"
-                    android:paddingEnd="@dimen/_4sdp"
-                    android:paddingBottom="@dimen/_4sdp"
-                    android:text="@string/gme_control_security_text"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/_10ssp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.5"
-                    app:layout_constraintStart_toEndOf="@+id/imageView7"
-                    app:layout_constraintTop_toBottomOf="@+id/container_partner_info" />
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+            android:id="@+id/mobile_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/receiver_label"
+            android:padding="@dimen/_8sdp"
+            android:text="@string/mobile_text"
+            android:textColor="@color/darkgray"
+            android:textSize="@dimen/_11ssp" />
+
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+            android:id="@+id/tv_mobile_no"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tv_address"
+            android:layout_alignParentRight="true"
+            android:padding="@dimen/_8sdp"
+            android:textColor="@color/darkgray"
+            android:textSize="@dimen/_11ssp"
+            app:txtfontName="@string/semibold" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/mobile_label"
+            android:background="@color/gray" />
 
 
+        <LinearLayout
+            android:id="@+id/notForHome"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/mobile_label"
+            android:orientation="vertical">
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
 
-            <RelativeLayout
+                android:background="@color/gray" />
+
+
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/_8sdp"
-                android:background="@drawable/ic_rectangle_white_extra_corners">
+                android:layout_height="wrap_content">
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:gravity="left"
                     android:padding="@dimen/_8sdp"
-                    android:text="@string/transaction_date_text"
+                    android:text="@string/payout_agent_text"
                     android:textColor="@color/darkgray"
                     android:textSize="@dimen/_11ssp" />
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:id="@+id/transaction_date"
-                    android:layout_width="wrap_content"
+                    android:id="@+id/tv_agent_bank"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
+                    android:layout_weight="1"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:maxLines="2"
                     android:padding="@dimen/_8sdp"
+                    android:singleLine="false"
+                    android:text=""
                     android:textColor="@color/darkgray"
                     android:textSize="@dimen/_11ssp"
                     app:txtfontName="@string/semibold" />
+            </LinearLayout>
 
+            <View
+                android:id="@+id/account_no_container_divider"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/gray"
+                android:visibility="gone" />
 
-            </RelativeLayout>
-
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/account_no_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/_8sdp"
-                android:background="@drawable/ic_rectangle_white_extra_corners">
-
-                <LinearLayout
-                    android:id="@+id/nameContainer"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:weightSum="1">
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:padding="@dimen/_8sdp"
-                        android:text="@string/receiver_text"
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp" />
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:id="@+id/tv_receiver"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="end"
-                        android:padding="@dimen/_8sdp"
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
-                        app:txtfontName="@string/semibold" />
-                </LinearLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_below="@id/nameContainer"
-                    android:background="@color/gray" />
+                android:visibility="gone">
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:id="@+id/receiver_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/nameContainer"
+                    android:gravity="left"
                     android:padding="@dimen/_8sdp"
-                    android:text="@string/address_text"
+                    android:text="@string/account_number_text"
                     android:textColor="@color/darkgray"
                     android:textSize="@dimen/_11ssp" />
 
                 <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:id="@+id/tv_address"
-                    android:layout_width="wrap_content"
+                    android:id="@+id/tv_acc_no"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/nameContainer"
-                    android:layout_alignParentRight="true"
-                    android:maxLength="25"
+                    android:layout_weight="1"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:maxLines="2"
                     android:padding="@dimen/_8sdp"
-                    android:singleLine="true"
+                    android:singleLine="false"
+                    android:text=""
                     android:textColor="@color/darkgray"
                     android:textSize="@dimen/_11ssp"
                     app:txtfontName="@string/semibold" />
+            </LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_below="@id/receiver_label"
-                    android:background="@color/gray" />
 
-                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:id="@+id/mobile_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/receiver_label"
-                    android:padding="@dimen/_8sdp"
-                    android:text="@string/mobile_text"
-                    android:textColor="@color/darkgray"
-                    android:textSize="@dimen/_11ssp" />
+        </LinearLayout>
 
-                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:id="@+id/tv_mobile_no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/tv_address"
-                    android:layout_alignParentRight="true"
-                    android:padding="@dimen/_8sdp"
-                    android:textColor="@color/darkgray"
-                    android:textSize="@dimen/_11ssp"
-                    app:txtfontName="@string/semibold" />
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_below="@id/mobile_label"
-                    android:background="@color/gray" />
+        <View
+            android:id="@+id/total_sent_amount_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/notForHome"
+            android:background="@color/gray" />
+
+        <RelativeLayout
+            android:id="@+id/total_sent_amount_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/total_sent_amount_divider">
 
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/_8sdp"
+                android:text="@string/total_sent_amount_text"
+                android:textColor="@color/darkgray"
+                android:textSize="@dimen/_11ssp" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:id="@+id/tv_total_sent_amount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:padding="@dimen/_8sdp"
+                android:text=""
+                android:textColor="@color/darkgray"
+                android:textSize="@dimen/_11ssp"
+                app:txtfontName="@string/semibold" />
+        </RelativeLayout>
+
+        <!---->
+        <View
+            android:id="@+id/service_fee_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/total_sent_amount_layout"
+            android:background="@color/gray" />
 
-                <LinearLayout
-                    android:id="@+id/notForHome"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/mobile_label"
-                    android:orientation="vertical">
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-
-                        android:background="@color/gray" />
-
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="left"
-                            android:padding="@dimen/_8sdp"
-                            android:text="@string/payout_agent_text"
-                            android:textColor="@color/darkgray"
-                            android:textSize="@dimen/_11ssp" />
-
-                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                            android:id="@+id/tv_agent_bank"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:ellipsize="end"
-                            android:gravity="right"
-                            android:maxLines="2"
-                            android:padding="@dimen/_8sdp"
-                            android:singleLine="false"
-                            android:text=""
-                            android:textColor="@color/darkgray"
-                            android:textSize="@dimen/_11ssp"
-                            app:txtfontName="@string/semibold" />
-                    </LinearLayout>
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:id="@+id/account_no_container_divider"
-                        android:visibility="gone"
-                        android:background="@color/gray" />
-                    <LinearLayout
-                        android:visibility="gone"
-                        android:id="@+id/account_no_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="left"
-                            android:padding="@dimen/_8sdp"
-                            android:text="@string/account_number_text"
-                            android:textColor="@color/darkgray"
-                            android:textSize="@dimen/_11ssp" />
-
-                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                            android:id="@+id/tv_acc_no"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:ellipsize="end"
-                            android:gravity="right"
-                            android:maxLines="2"
-                            android:padding="@dimen/_8sdp"
-                            android:singleLine="false"
-                            android:text=""
-                            android:textColor="@color/darkgray"
-                            android:textSize="@dimen/_11ssp"
-                            app:txtfontName="@string/semibold" />
-                    </LinearLayout>
-
-
-                </LinearLayout>
-
-
-                <View
-                    android:id="@+id/total_sent_amount_divider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_below="@id/notForHome"
-                    android:background="@color/gray" />
-
-                <RelativeLayout
-                    android:id="@+id/total_sent_amount_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/total_sent_amount_divider">
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:padding="@dimen/_8sdp"
-                        android:text="@string/total_sent_amount_text"
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp" />
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:id="@+id/tv_total_sent_amount"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:padding="@dimen/_8sdp"
-                        android:text=""
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
-                        app:txtfontName="@string/semibold" />
-                </RelativeLayout>
-
-                <!---->
-                <View
-                    android:id="@+id/service_fee_divider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_below="@id/total_sent_amount_layout"
-                    android:background="@color/gray" />
-
-                <RelativeLayout
-                    android:id="@+id/service_fee_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/service_fee_divider">
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:padding="@dimen/_8sdp"
-                        android:text="@string/service_fee_text"
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp" />
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:id="@+id/tv_order_date"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:padding="@dimen/_8sdp"
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
-                        app:txtfontName="@string/semibold" />
-                </RelativeLayout>
-                <!---->
-                <View
-                    android:id="@+id/coupon_fee_divider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_below="@id/service_fee_layout"
-                    android:background="@color/gray" />
-
-                <RelativeLayout
-                    android:id="@+id/coupon_fee_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/coupon_fee_divider">
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:padding="@dimen/_8sdp"
-                        android:text="@string/used_coupon_title_text"
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp" />
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:id="@+id/tv_coupon"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:padding="@dimen/_8sdp"
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
-                        app:txtfontName="@string/semibold" />
-                </RelativeLayout>
-                <!---->
-                <View
-                    android:id="@+id/exrate_divider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_below="@id/coupon_fee_layout"
-                    android:background="@color/gray" />
-
-                <RelativeLayout
-                    android:id="@+id/exrate_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/exrate_divider">
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:padding="@dimen/_8sdp"
-                        android:text="@string/ex_rate_text"
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp" />
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:id="@+id/exrate_fee"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:padding="@dimen/_8sdp"
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
-                        app:txtfontName="@string/semibold" />
-                </RelativeLayout>
-
-                <View
-                    android:id="@+id/total_amount_divider"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_below="@id/exrate_layout"
-                    android:background="@color/gray" />
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/total_amount_divider">
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:padding="@dimen/_8sdp"
-                        android:text="@string/total_payout_amount_text"
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp" />
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:id="@+id/tv_total_amount"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:padding="@dimen/_8sdp"
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp"
-                        app:txtfontName="@string/semibold" />
-                </RelativeLayout>
-            </RelativeLayout>
-
-
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-                android:id="@+id/btn_submit"
-                style="@style/gme_button"
-                android:layout_gravity="center"
-                android:layout_marginTop="20dp"
-                android:layout_marginBottom="30dp"
-                android:background="@drawable/ic_rounded_background_red_coloured"
-                android:text="@string/done_text"
-                android:textAllCaps="false"
-                android:textColor="@color/white"
-                android:textSize="@dimen/_12ssp" />
+        <RelativeLayout
+            android:id="@+id/service_fee_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/service_fee_divider">
 
-            <LinearLayout
-                android:id="@+id/ammendmentOperationViewContainer"
-                android:layout_width="match_parent"
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:layout_marginBottom="30dp"
-                android:orientation="horizontal"
-                android:weightSum="1">
-
-
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-                        android:layout_marginStart="@dimen/_5sdp"
-                        android:layout_marginEnd="@dimen/_5sdp"
-                        android:paddingStart="@dimen/_5sdp"
-                        android:paddingEnd="@dimen/_5sdp"
-                        android:id="@+id/btn_cancel"
-                        style="@style/gme_button"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight=".5"
-                        android:background="@drawable/ic_rounded_background_red_coloured"
-                        android:inputType="textMultiLine"
-                        android:text="@string/request_to_cancel_text"
-                        android:textAllCaps="false"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/_10ssp" />
-
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-                        android:layout_marginStart="@dimen/_5sdp"
-                        android:layout_marginEnd="@dimen/_5sdp"
-                        android:paddingStart="@dimen/_5sdp"
-                        android:paddingEnd="@dimen/_5sdp"
-                        android:id="@+id/btn_change"
-                        style="@style/gme_button"
-                        android:layout_gravity="center"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight=".5"
-                        android:background="@drawable/ic_rounded_background_red_coloured"
-                        android:text="@string/request_to_change_text"
-                        android:textAllCaps="false"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/_10ssp" />
-            </LinearLayout>
+                android:padding="@dimen/_8sdp"
+                android:text="@string/service_fee_text"
+                android:textColor="@color/darkgray"
+                android:textSize="@dimen/_11ssp" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:id="@+id/tv_order_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:padding="@dimen/_8sdp"
+                android:textColor="@color/darkgray"
+                android:textSize="@dimen/_11ssp"
+                app:txtfontName="@string/semibold" />
+        </RelativeLayout>
+        <!---->
+        <View
+            android:id="@+id/coupon_fee_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/service_fee_layout"
+            android:background="@color/gray" />
 
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>
+        <RelativeLayout
+            android:id="@+id/coupon_fee_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/coupon_fee_divider">
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/_8sdp"
+                android:text="@string/used_coupon_title_text"
+                android:textColor="@color/darkgray"
+                android:textSize="@dimen/_11ssp" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:id="@+id/tv_coupon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:padding="@dimen/_8sdp"
+                android:textColor="@color/darkgray"
+                android:textSize="@dimen/_11ssp"
+                app:txtfontName="@string/semibold" />
+        </RelativeLayout>
+        <!---->
+        <View
+            android:id="@+id/exrate_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/coupon_fee_layout"
+            android:background="@color/gray" />
+
+        <RelativeLayout
+            android:id="@+id/exrate_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/exrate_divider">
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/_8sdp"
+                android:text="@string/ex_rate_text"
+                android:textColor="@color/darkgray"
+                android:textSize="@dimen/_11ssp" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:id="@+id/exrate_fee"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:padding="@dimen/_8sdp"
+                android:textColor="@color/darkgray"
+                android:textSize="@dimen/_11ssp"
+                app:txtfontName="@string/semibold" />
+        </RelativeLayout>
+
+        <View
+            android:id="@+id/total_amount_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/exrate_layout"
+            android:background="@color/gray" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/total_amount_divider">
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/_8sdp"
+                android:text="@string/total_payout_amount_text"
+                android:textColor="@color/darkgray"
+                android:textSize="@dimen/_11ssp" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:id="@+id/tv_total_amount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:padding="@dimen/_8sdp"
+                android:textColor="@color/darkgray"
+                android:textSize="@dimen/_11ssp"
+                app:txtfontName="@string/semibold" />
+        </RelativeLayout>
+    </RelativeLayout>
+
+
+    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
+        android:id="@+id/btn_submit"
+        style="@style/gme_button"
+        android:layout_gravity="center"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="30dp"
+        android:background="@drawable/ic_rounded_background_red_coloured"
+        android:text="@string/done_text"
+        android:textAllCaps="false"
+        android:textColor="@color/white"
+        android:textSize="@dimen/_12ssp" />
+
+    <LinearLayout
+        android:id="@+id/ammendmentOperationViewContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="30dp"
+        android:orientation="horizontal"
+        android:weightSum="1">
+
+
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
+            android:id="@+id/btn_cancel"
+            style="@style/gme_button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/_5sdp"
+            android:layout_marginEnd="@dimen/_5sdp"
+            android:layout_weight=".5"
+            android:background="@drawable/ic_rounded_background_red_coloured"
+            android:inputType="textMultiLine"
+            android:paddingStart="@dimen/_5sdp"
+            android:paddingEnd="@dimen/_5sdp"
+            android:text="@string/request_to_cancel_text"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_10ssp" />
+
+
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
+            android:id="@+id/btn_change"
+            style="@style/gme_button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="@dimen/_5sdp"
+            android:layout_marginEnd="@dimen/_5sdp"
+            android:layout_weight=".5"
+            android:background="@drawable/ic_rounded_background_red_coloured"
+            android:paddingStart="@dimen/_5sdp"
+            android:paddingEnd="@dimen/_5sdp"
+            android:text="@string/request_to_change_text"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_10ssp" />
+    </LinearLayout>
+
+</LinearLayout></ScrollView></LinearLayout>