From 74fb1947be0fd38f0d544f15cbc3b8963e1442cc Mon Sep 17 00:00:00 2001
From: ssabeerahamed <ssabeerahamed@paypal.com>
Date: Wed, 25 Nov 2020 21:59:32 +0530
Subject: [PATCH 1/5] DTSERWFOUR -189 wrap labels.

---
 .../src/main/res/layout/fragment_receipt_detail.xml |  6 ++++--
 .../main/res/layout/item_receipt_with_header.xml    |  3 ++-
 receiptui/src/main/res/layout/receipt.xml           | 13 ++++++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/receiptui/src/main/res/layout/fragment_receipt_detail.xml b/receiptui/src/main/res/layout/fragment_receipt_detail.xml
index 3d4421c6e..f55fe5bfc 100644
--- a/receiptui/src/main/res/layout/fragment_receipt_detail.xml
+++ b/receiptui/src/main/res/layout/fragment_receipt_detail.xml
@@ -40,9 +40,11 @@
                 android:layout_marginStart="@dimen/grid_margin_left"
                 android:layout_marginEnd="@dimen/grid_margin_right"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/item_receipt_information_height">
+                android:layout_height="wrap_content">
 
-                <include layout="@layout/receipt" />
+                <include layout="@layout/receipt"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"/>
 
                 <View
                     android:layout_width="match_parent"
diff --git a/receiptui/src/main/res/layout/item_receipt_with_header.xml b/receiptui/src/main/res/layout/item_receipt_with_header.xml
index 406bc587d..639ac9bcf 100644
--- a/receiptui/src/main/res/layout/item_receipt_with_header.xml
+++ b/receiptui/src/main/res/layout/item_receipt_with_header.xml
@@ -26,9 +26,10 @@
         android:background="@drawable/view_item_ripple"
         android:id="@+id/receipt_item"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/grid_margin_left"
         android:layout_marginEnd="@dimen/grid_margin_right"
-        android:layout_height="@dimen/item_receipt_information_height">
+        android:minHeight="@dimen/item_receipt_information_height">
 
         <include layout="@layout/receipt" />
 
diff --git a/receiptui/src/main/res/layout/receipt.xml b/receiptui/src/main/res/layout/receipt.xml
index 9fd3af32e..b0f8261eb 100644
--- a/receiptui/src/main/res/layout/receipt.xml
+++ b/receiptui/src/main/res/layout/receipt.xml
@@ -14,21 +14,23 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/text_placeholder"
-        android:ellipsize="end"
-        android:maxLines="1"
         style="@style/ReceiptTitle"
         app:layout_constraintEnd_toStartOf="@+id/transaction_amount"
         app:layout_constraintStart_toEndOf="@+id/transaction_type_icon"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView android:id="@+id/transaction_date"
+    <TextView
+        android:id="@+id/transaction_date"
+        style="@style/ReceiptDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/text_placeholder"
-        style="@style/ReceiptDate"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/transaction_currency"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/transaction_type_icon"
-        app:layout_constraintTop_toBottomOf="@+id/transaction_title" />
+        app:layout_constraintTop_toBottomOf="@+id/transaction_title"
+        app:layout_constraintVertical_bias="0.0" />
 
     <TextView android:id="@+id/transaction_amount"
         android:layout_width="wrap_content"
@@ -46,4 +48,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/transaction_title" />
+
 </merge>
\ No newline at end of file

From 3d2ed9c8393070816eca3f9b807f803877496ac9 Mon Sep 17 00:00:00 2001
From: ssabeerahamed <ssabeerahamed@paypal.com>
Date: Fri, 27 Nov 2020 23:54:12 +0530
Subject: [PATCH 2/5] DTSERWFOUR -189 wrap labels.

---
 .../src/main/res/layout/fragment_receipt_detail.xml |  4 +---
 receiptui/src/main/res/layout/item_receipt.xml      | 10 ++++++----
 .../main/res/layout/item_receipt_with_header.xml    |  3 +--
 receiptui/src/main/res/layout/receipt.xml           | 13 +++++++------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/receiptui/src/main/res/layout/fragment_receipt_detail.xml b/receiptui/src/main/res/layout/fragment_receipt_detail.xml
index f55fe5bfc..ebc6b33ea 100644
--- a/receiptui/src/main/res/layout/fragment_receipt_detail.xml
+++ b/receiptui/src/main/res/layout/fragment_receipt_detail.xml
@@ -42,9 +42,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <include layout="@layout/receipt"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"/>
+                <include layout="@layout/receipt" />
 
                 <View
                     android:layout_width="match_parent"
diff --git a/receiptui/src/main/res/layout/item_receipt.xml b/receiptui/src/main/res/layout/item_receipt.xml
index 66a3352e2..b2eb07603 100644
--- a/receiptui/src/main/res/layout/item_receipt.xml
+++ b/receiptui/src/main/res/layout/item_receipt.xml
@@ -1,13 +1,15 @@
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/receipt_item"
     style="@style/ReceiptItem"
     android:layout_marginStart="@dimen/grid_margin_left"
+    android:orientation="vertical"
     android:layout_marginEnd="@dimen/grid_margin_right"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/item_receipt_information_height">
+    android:layout_height="wrap_content">
 
-    <include layout="@layout/receipt" />
+    <include
+        layout="@layout/receipt"/>
 
     <View
         android:layout_width="match_parent"
@@ -15,4 +17,4 @@
         android:background="?android:attr/listDivider"
         app:layout_constraintBottom_toBottomOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/receiptui/src/main/res/layout/item_receipt_with_header.xml b/receiptui/src/main/res/layout/item_receipt_with_header.xml
index 639ac9bcf..fd215f774 100644
--- a/receiptui/src/main/res/layout/item_receipt_with_header.xml
+++ b/receiptui/src/main/res/layout/item_receipt_with_header.xml
@@ -26,10 +26,9 @@
         android:background="@drawable/view_item_ripple"
         android:id="@+id/receipt_item"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/grid_margin_left"
         android:layout_marginEnd="@dimen/grid_margin_right"
-        android:minHeight="@dimen/item_receipt_information_height">
+        android:layout_height="wrap_content">
 
         <include layout="@layout/receipt" />
 
diff --git a/receiptui/src/main/res/layout/receipt.xml b/receiptui/src/main/res/layout/receipt.xml
index b0f8261eb..aa713cd9c 100644
--- a/receiptui/src/main/res/layout/receipt.xml
+++ b/receiptui/src/main/res/layout/receipt.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
 
     <TextView android:id="@+id/transaction_type_icon"
         style="@style/ReceiptTypeIcon"
@@ -22,12 +25,11 @@
     <TextView
         android:id="@+id/transaction_date"
         style="@style/ReceiptDate"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/text_placeholder"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/transaction_currency"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/transaction_type_icon"
         app:layout_constraintTop_toBottomOf="@+id/transaction_title"
         app:layout_constraintVertical_bias="0.0" />
@@ -48,5 +50,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/transaction_title" />
-
-</merge>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From e074fdef46602034c6d146b00c1ad8a55a646ccf Mon Sep 17 00:00:00 2001
From: ssabeerahamed <ssabeerahamed@paypal.com>
Date: Sat, 28 Nov 2020 01:33:52 +0530
Subject: [PATCH 3/5] DTSERWFOUR -189 wrap labels.

---
 .../src/main/res/layout/fragment_receipt_detail.xml    | 10 ----------
 receiptui/src/main/res/layout/item_receipt.xml         |  4 ++--
 receiptui/src/main/res/layout/receipt.xml              |  8 +++-----
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/receiptui/src/main/res/layout/fragment_receipt_detail.xml b/receiptui/src/main/res/layout/fragment_receipt_detail.xml
index ebc6b33ea..397435de2 100644
--- a/receiptui/src/main/res/layout/fragment_receipt_detail.xml
+++ b/receiptui/src/main/res/layout/fragment_receipt_detail.xml
@@ -138,8 +138,6 @@
                         android:layout_alignParentEnd="true"
                         android:layout_marginStart="@dimen/grid_margin_left"
                         android:gravity="end"
-                        android:ellipsize="end"
-                        android:maxLines="1"
                         android:paddingTop="@dimen/item_text_top_bottom_margin"
                         tools:text="@string/text_placeholder"
                         android:textAppearance="@style/TextAppearance.Hyperwallet.Caption" />
@@ -176,8 +174,6 @@
                         android:paddingEnd="@dimen/item_text_top_bottom_margin"
                         android:layout_marginTop="@dimen/item_text_top_bottom_margin"
                         android:layout_toEndOf="@+id/client_id_label"
-                        android:ellipsize="end"
-                        android:maxLines="1"
                         android:gravity="end"
                         tools:text="@string/text_placeholder"
                         android:textAppearance="@style/TextAppearance.Hyperwallet.Caption"
@@ -213,8 +209,6 @@
                               android:layout_marginStart="@dimen/item_text_top_bottom_margin"
                               android:layout_marginTop="@dimen/item_text_top_bottom_margin"
                               android:layout_toEndOf="@+id/charity_label"
-                              android:ellipsize="end"
-                              android:maxLines="1"
                         android:gravity="end"
                         tools:text="@string/text_placeholder"
                         android:textAppearance="@style/TextAppearance.Hyperwallet.Caption"
@@ -251,8 +245,6 @@
                         android:layout_marginStart="@dimen/item_text_top_bottom_margin"
                         android:layout_marginTop="@dimen/item_text_top_bottom_margin"
                         android:layout_toEndOf="@+id/check_number_label"
-                        android:ellipsize="end"
-                        android:maxLines="1"
                         android:gravity="end"
                         tools:text="@string/text_placeholder"
                         android:textAppearance="@style/TextAppearance.Hyperwallet.Caption"
@@ -289,8 +281,6 @@
                         android:layout_marginStart="@dimen/item_text_top_bottom_margin"
                         android:layout_marginTop="@dimen/item_text_top_bottom_margin"
                         android:layout_toEndOf="@+id/website_label"
-                        android:ellipsize="end"
-                        android:maxLines="1"
                         android:gravity="end"
                         tools:text="@string/text_placeholder"
                         android:textAppearance="@style/TextAppearance.Hyperwallet.Caption"
diff --git a/receiptui/src/main/res/layout/item_receipt.xml b/receiptui/src/main/res/layout/item_receipt.xml
index b2eb07603..b4187905f 100644
--- a/receiptui/src/main/res/layout/item_receipt.xml
+++ b/receiptui/src/main/res/layout/item_receipt.xml
@@ -1,4 +1,4 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/receipt_item"
     style="@style/ReceiptItem"
@@ -17,4 +17,4 @@
         android:background="?android:attr/listDivider"
         app:layout_constraintBottom_toBottomOf="parent" />
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/receiptui/src/main/res/layout/receipt.xml b/receiptui/src/main/res/layout/receipt.xml
index aa713cd9c..392ad9fce 100644
--- a/receiptui/src/main/res/layout/receipt.xml
+++ b/receiptui/src/main/res/layout/receipt.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
     <TextView android:id="@+id/transaction_type_icon"
@@ -50,4 +48,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/transaction_title" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</merge>
\ No newline at end of file

From f222863f4eac7f489c82a273c1ed5c947dacc1c6 Mon Sep 17 00:00:00 2001
From: ssabeerahamed <ssabeerahamed@paypal.com>
Date: Mon, 30 Nov 2020 11:22:40 +0530
Subject: [PATCH 4/5] DTSERWFOUR -189 wrap labels to next line.

---
 receiptui/src/main/res/layout/fragment_receipt_detail.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/receiptui/src/main/res/layout/fragment_receipt_detail.xml b/receiptui/src/main/res/layout/fragment_receipt_detail.xml
index 397435de2..538fa614b 100644
--- a/receiptui/src/main/res/layout/fragment_receipt_detail.xml
+++ b/receiptui/src/main/res/layout/fragment_receipt_detail.xml
@@ -103,8 +103,6 @@
                         android:layout_alignParentTop="true"
                         android:layout_alignParentEnd="true"
                         android:gravity="end"
-                        android:ellipsize="end"
-                        android:maxLines="1"
                         android:layout_marginStart="@dimen/grid_margin_left"
                         android:layout_toEndOf="@+id/receipt_id_label"
                         android:layout_marginTop="@dimen/grid_margin_top"
@@ -387,8 +385,6 @@
                         android:layout_alignParentTop="true"
                         android:layout_alignParentEnd="true"
                         android:gravity="end"
-                        android:ellipsize="end"
-                        android:maxLines="1"
                         android:layout_marginStart="@dimen/grid_margin_left"
                         android:layout_toEndOf="@+id/details_amount_label"
                         android:layout_marginTop="@dimen/grid_margin_top"
@@ -427,8 +423,6 @@
                         android:layout_alignParentTop="true"
                         android:layout_alignParentEnd="true"
                         android:gravity="end"
-                        android:ellipsize="end"
-                        android:maxLines="1"
                         android:layout_marginStart="@dimen/grid_margin_left"
                         android:layout_toEndOf="@+id/details_fee_label"
                         android:layout_marginTop="@dimen/grid_margin_top"
@@ -467,8 +461,6 @@
                         android:layout_alignParentTop="true"
                         android:layout_alignParentEnd="true"
                         android:gravity="end"
-                        android:ellipsize="end"
-                        android:maxLines="1"
                         android:layout_marginStart="@dimen/grid_margin_left"
                         android:layout_toEndOf="@+id/details_transfer_amount_label"
                         android:layout_marginTop="@dimen/grid_margin_top"

From 64db75246e66be97f4ecb201586380e92455b0f4 Mon Sep 17 00:00:00 2001
From: ssabeerahamed <ssabeerahamed@paypal.com>
Date: Mon, 30 Nov 2020 15:05:44 +0530
Subject: [PATCH 5/5] DTSERWFOUR -189 address review comments.

---
 receiptui/src/main/res/layout/item_receipt.xml | 3 +--
 receiptui/src/main/res/layout/receipt.xml      | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/receiptui/src/main/res/layout/item_receipt.xml b/receiptui/src/main/res/layout/item_receipt.xml
index b4187905f..3343b7983 100644
--- a/receiptui/src/main/res/layout/item_receipt.xml
+++ b/receiptui/src/main/res/layout/item_receipt.xml
@@ -8,8 +8,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <include
-        layout="@layout/receipt"/>
+    <include layout="@layout/receipt"/>
 
     <View
         android:layout_width="match_parent"
diff --git a/receiptui/src/main/res/layout/receipt.xml b/receiptui/src/main/res/layout/receipt.xml
index 392ad9fce..06617caa2 100644
--- a/receiptui/src/main/res/layout/receipt.xml
+++ b/receiptui/src/main/res/layout/receipt.xml
@@ -2,7 +2,6 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-
     <TextView android:id="@+id/transaction_type_icon"
         style="@style/ReceiptTypeIcon"
         android:layout_marginStart="@dimen/widget_default_margin"
@@ -29,8 +28,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/transaction_currency"
         app:layout_constraintStart_toEndOf="@+id/transaction_type_icon"
-        app:layout_constraintTop_toBottomOf="@+id/transaction_title"
-        app:layout_constraintVertical_bias="0.0" />
+        app:layout_constraintTop_toBottomOf="@+id/transaction_title" />
 
     <TextView android:id="@+id/transaction_amount"
         android:layout_width="wrap_content"