Merge branch 'forgot-pasword'

app/src/main/res/layout/activity_payment.xml

@@ -26,6 +26,12 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/cvInvoice"
             android:layout_above="@id/btnPay"
+            android:overScrollMode="never"
+            android:scrollingCache="false"
+            android:fadingEdge="none"
+            android:fadingEdgeLength="0dp"
+            android:scrollbars="none"
+            android:scrollbarStyle="insideOverlay"
             >
 
             <RelativeLayout
@@ -58,21 +64,15 @@
 
                     />
 
-                <ExpandableListView
-                    android:layout_width="fill_parent"
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rvPayment"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@+id/tvLabel">
-
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/rvPayment"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="10dp"
-                        android:nestedScrollingEnabled="false"
-                        tools:layout_editor_absoluteX="10dp"
-                        tools:listitem="@layout/payment_list"/>
-
-                </ExpandableListView>
+                    android:layout_margin="10dp"
+                    android:nestedScrollingEnabled="false"
+                    tools:layout_editor_absoluteX="10dp"
+                    android:layout_below="@id/tvLabel"
+                    tools:listitem="@layout/payment_list"/>
             </RelativeLayout>
         </ScrollView>