From d843bdb4515599a7c983726e052d977743015a97 Mon Sep 17 00:00:00 2001
From: m2049r <30435443+m2049r@users.noreply.github.com>
Date: Sun, 24 Dec 2017 14:18:32 +0100
Subject: [PATCH] Tweaks (#167)

* update privacy policy

* fix height

* send confirm scrollable

* use clickable instead of enabled

* rename
---
 .../xmrwallet/GenerateReviewFragment.java     |   3 +-
 .../com/m2049r/xmrwallet/ReceiveFragment.java |   3 +-
 .../xmrwallet/fragment/send/SendFragment.java |   2 +-
 app/src/main/res/layout/fragment_receive.xml  |   2 +-
 app/src/main/res/layout/fragment_review.xml   |   2 +-
 app/src/main/res/layout/fragment_send.xml     | 339 +++-----------
 .../res/layout/fragment_send_btc_confirm.xml  | 429 +++++++++---------
 .../main/res/layout/fragment_send_confirm.xml | 303 +++++++------
 app/src/main/res/layout/fragment_send_new.xml |  71 ---
 app/src/main/res/values/about.xml             |   3 +
 10 files changed, 438 insertions(+), 719 deletions(-)
 delete mode 100644 app/src/main/res/layout/fragment_send_new.xml

diff --git a/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java b/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
index 6a7e021..8ec29c7 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java
@@ -103,6 +103,7 @@ public class GenerateReviewFragment extends Fragment {
                 copyAddress();
             }
         });
+        bCopyAddress.setClickable(false);
         view.findViewById(R.id.bAdvancedInfo).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -213,7 +214,7 @@ public class GenerateReviewFragment extends Fragment {
                 tvWalletViewKey.setText(viewKey);
                 tvWalletSpendKey.setText(spendKey);
                 bAdvancedInfo.setVisibility(View.VISIBLE);
-                bCopyAddress.setEnabled(true);
+                bCopyAddress.setClickable(true);
                 bCopyAddress.setImageResource(R.drawable.ic_content_copy_black_24dp);
                 activityCallback.setTitle(name, getString(R.string.details_title));
                 activityCallback.setToolbarButton(
diff --git a/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java b/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java
index 52d51c7..e7b8dae 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java
@@ -106,6 +106,7 @@ public class ReceiveFragment extends Fragment {
                 copyAddress();
             }
         });
+        bCopyAddress.setClickable(false);
 
         evAmount.setOnNewAmountListener(new ExchangeView.OnNewAmountListener() {
             @Override
@@ -240,7 +241,7 @@ public class ReceiveFragment extends Fragment {
         tvAddress.setText(address);
         etPaymentId.setEnabled(true);
         bPaymentId.setEnabled(true);
-        bCopyAddress.setEnabled(true);
+        bCopyAddress.setClickable(true);
         bCopyAddress.setImageResource(R.drawable.ic_content_copy_black_24dp);
         hideProgress();
         generateQr();
diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java
index 664ee60..2146eb6 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java
@@ -99,7 +99,7 @@ public class SendFragment extends Fragment
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
-        final View view = inflater.inflate(R.layout.fragment_send_new, container, false);
+        final View view = inflater.inflate(R.layout.fragment_send, container, false);
 
         llNavBar = view.findViewById(R.id.llNavBar);
         bDone = (Button) view.findViewById(R.id.bDone);
diff --git a/app/src/main/res/layout/fragment_receive.xml b/app/src/main/res/layout/fragment_receive.xml
index bb76485..4d8b5d3 100644
--- a/app/src/main/res/layout/fragment_receive.xml
+++ b/app/src/main/res/layout/fragment_receive.xml
@@ -42,7 +42,7 @@
                 android:layout_gravity="end"
                 android:layout_marginEnd="80dp"
                 android:background="?android:selectableItemBackground"
-                android:enabled="false"
+                android:clickable="false"
                 android:src="@drawable/ic_content_nocopy_black_24dp" />
         </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_review.xml b/app/src/main/res/layout/fragment_review.xml
index bd294a3..fb84776 100644
--- a/app/src/main/res/layout/fragment_review.xml
+++ b/app/src/main/res/layout/fragment_review.xml
@@ -86,7 +86,7 @@
                 android:layout_gravity="end"
                 android:layout_marginEnd="80dp"
                 android:background="?android:selectableItemBackground"
-                android:enabled="false"
+                android:clickable="false"
                 android:src="@drawable/ic_content_nocopy_black_24dp" />
         </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_send.xml b/app/src/main/res/layout/fragment_send.xml
index 610db21..7941224 100644
--- a/app/src/main/res/layout/fragment_send.xml
+++ b/app/src/main/res/layout/fragment_send.xml
@@ -1,296 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="8dp">
+    android:orientation="vertical">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <EditText
+        android:id="@+id/etDummy"
+        android:layout_width="0dp"
+        android:layout_height="0dp" />
+
+    <com.m2049r.xmrwallet.layout.SpendViewPager
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/llNavBar"
+        android:padding="8dp" />
+
+    <LinearLayout
+        android:id="@+id/llNavBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:orientation="horizontal"
-            android:weightSum="10">
-
-            <android.support.design.widget.TextInputLayout
-                android:id="@+id/etAddress"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="10"
-                app:counterEnabled="true"
-                app:counterMaxLength="95"
-                app:errorEnabled="true">
-
-                <android.support.design.widget.TextInputEditText
-                    style="@style/MoneroEdit"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/send_address_hint"
-                    android:imeOptions="actionNext"
-                    android:inputType="textMultiLine"
-                    android:textAlignment="textStart" />
-            </android.support.design.widget.TextInputLayout>
-
-            <Button
-                android:id="@+id/bScan"
-                style="@style/MoneroText.Button"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_gravity="center"
-                android:layout_marginStart="16dp"
-                android:background="@drawable/ic_scan"
-                android:text="@string/send_qr_hint" />
-        </LinearLayout>
-
-        <com.m2049r.xmrwallet.widget.ExchangeView
-            android:id="@+id/evAmount"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:layout_marginTop="0dp"
-            android:orientation="vertical" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:orientation="horizontal"
-            android:weightSum="10">
-
-            <android.support.design.widget.TextInputLayout
-                android:id="@+id/etPaymentId"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="10"
-                app:counterEnabled="true"
-                app:counterMaxLength="16"
-                app:errorEnabled="true">
-
-                <android.support.design.widget.TextInputEditText
-                    style="@style/MoneroEdit"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="10"
-                    android:backgroundTint="@color/moneroGray"
-                    android:hint="@string/send_paymentid_hint"
-                    android:imeOptions="actionDone"
-                    android:inputType="textMultiLine"
-                    android:textAlignment="textStart" />
-            </android.support.design.widget.TextInputLayout>
-
-            <Button
-                android:id="@+id/bPaymentId"
-                style="@style/MoneroText.Button.Small"
-                android:layout_width="56dp"
-                android:layout_height="56dp"
-                android:layout_gravity="center"
-                android:layout_marginStart="8dp"
-                android:background="?android:selectableItemBackground"
-                android:drawableTop="@drawable/ic_settings_orange_24dp"
-                android:text="@string/send_generate_paymentid_hint"
-                android:textColor="@color/moneroGray" />
-        </LinearLayout>
-
-        <EditText
-            android:id="@+id/etDummy"
-            android:layout_width="0dp"
-            android:layout_height="0dp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16sp"
-            android:orientation="horizontal">
-
-            <TextView
-                style="@style/MoneroLabel.Caps.Gray.Small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center|end"
-                android:layout_marginEnd="8dp"
-                android:text="Advanced:"
-                android:textAlignment="textEnd" />
-
-            <Spinner
-                android:id="@+id/sMixin"
-                style="@style/MoneroSpinnerGray"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_weight="1"
-                android:entries="@array/mixin"
-                android:textAlignment="center" />
-
-            <Spinner
-                android:id="@+id/sPriority"
-                style="@style/MoneroSpinnerGray"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:entries="@array/priority"
-                android:textAlignment="center" />
-
-        </LinearLayout>
+        android:layout_alignParentBottom="true"
+        android:layout_gravity="bottom"
+        android:orientation="horizontal">
 
         <Button
-            android:id="@+id/bPrepareSend"
+            android:id="@+id/bPrev"
             style="@style/MoneroButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="4dp"
-            android:enabled="true"
-            android:minHeight="36dp"
-            android:text="@string/send_prepare_hint" />
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:drawableStart="@drawable/ic_navigate_prev_white_24dp"
+            tools:text="Back" />
 
-        <ProgressBar
-            android:id="@+id/pbProgress"
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:indeterminate="true"
-            android:visibility="gone" />
-
-        <LinearLayout
-            android:id="@+id/llConfirmSend"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="4dp"
-            android:orientation="vertical"
-            android:visibility="gone">
-
-            <Button
-                android:id="@+id/bDispose"
-                style="@style/MoneroButton.Alert"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:minHeight="36dp"
-                android:text="@string/send_dispose_hint" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:weightSum="3">
-
-                <TextView
-                    android:id="@+id/tvTxAmountLabel"
-                    style="@style/MoneroLabel.Caps"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:layout_weight="1"
-                    android:text="@string/send_amount_label"
-                    android:textAlignment="textEnd" />
-
-                <TextView
-                    android:id="@+id/tvTxAmount"
-                    style="@style/MoneroText"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_weight="2"
-                    android:textAlignment="textEnd"
-                    tools:text="143.008000000000" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:weightSum="3">
-
-                <TextView
-                    android:id="@+id/tvTxFeeLabel"
-                    style="@style/MoneroLabel.Caps.Gray"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="4dp"
-                    android:layout_weight="1"
-                    android:text="@string/send_fee_label"
-                    android:textAlignment="textEnd" />
-
-                <TextView
-                    android:id="@+id/tvTxFee"
-                    style="@style/MoneroText.Gray"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_weight="2"
-                    android:textAlignment="textEnd"
-                    tools:text="0.006817000000" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:weightSum="3">
-
-                <TextView
-                    android:id="@+id/tvTxTotalLabel"
-                    style="@style/MoneroLabel.Caps.Black"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:layout_weight="1"
-                    android:text="@string/send_total_label"
-                    android:textAlignment="textEnd" />
-
-                <TextView
-                    android:id="@+id/tvTxTotal"
-                    style="@style/MoneroText.Black"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_weight="2"
-                    android:textAlignment="textEnd"
-                    tools:text="143.014817000000" />
-            </LinearLayout>
-
-            <EditText
-                android:id="@+id/etNotes"
-                style="@style/MoneroEdit"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:backgroundTint="@color/moneroGray"
-                android:hint="@string/send_notes_hint"
-                android:imeOptions="actionDone"
-                android:inputType="textMultiLine"
-                android:textAlignment="textStart" />
-
-            <Button
-                android:id="@+id/bSend"
-                style="@style/MoneroButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginTop="4dp"
-                android:enabled="false"
-                android:minHeight="36dp"
-                android:text="@string/send_send_label" />
-
-            <Button
-                android:id="@+id/bReallySend"
-                style="@style/MoneroButton.ReallySend"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="16dp"
-                android:enabled="false"
-                android:padding="8dp"
-                android:text="@string/send_really_send_hint"
-                android:visibility="gone" />
-        </LinearLayout>
+        <com.m2049r.xmrwallet.widget.DotBar
+            android:id="@+id/dotBar"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:background="@color/gradientOrange"
+            app:activeColor="@color/white"
+            app:activeDot="0"
+            app:dotSize="12dp"
+            app:inactiveColor="@color/dotGray"
+            app:numberDots="4" />
 
+        <Button
+            android:id="@+id/bNext"
+            style="@style/MoneroButton"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:drawableEnd="@drawable/ic_navigate_next_white_24dp"
+            tools:text="Next" />
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+
+    <Button
+        android:id="@+id/bDone"
+        style="@style/MoneroButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_gravity="bottom"
+        android:text="@string/label_send_done"
+        android:visibility="gone" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_send_btc_confirm.xml b/app/src/main/res/layout/fragment_send_btc_confirm.xml
index 2a7b151..16c0749 100644
--- a/app/src/main/res/layout/fragment_send_btc_confirm.xml
+++ b/app/src/main/res/layout/fragment_send_btc_confirm.xml
@@ -1,252 +1,257 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:foreground="?android:attr/selectableItemBackground"
-        card_view:cardCornerRadius="2dp"
-        card_view:cardElevation="8dp"
-        card_view:contentPadding="8dp">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <LinearLayout
+        <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_margin="16dp"
+            android:foreground="?android:attr/selectableItemBackground"
+            card_view:cardCornerRadius="2dp"
+            card_view:cardElevation="8dp"
+            card_view:contentPadding="8dp">
 
-            <FrameLayout
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
-                <com.m2049r.xmrwallet.widget.SendProgressView
-                    android:id="@+id/evStageA"
+                <FrameLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center" />
+                    android:layout_height="wrap_content">
+
+                    <com.m2049r.xmrwallet.widget.SendProgressView
+                        android:id="@+id/evStageA"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center" />
+
+                    <LinearLayout
+                        android:id="@+id/llStageA"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:orientation="vertical"
+                        android:visibility="invisible">
+
+                        <TextView
+                            style="@style/MoneroText.Confirm.Label"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="8dp"
+                            android:drawablePadding="8dp"
+                            android:drawableStart="@drawable/ic_xmrto_32dp"
+                            android:gravity="center_vertical"
+                            android:text="@string/label_send_btc_xmrto_key" />
+
+                        <TextView
+                            android:id="@+id/tvTxXmrToKey"
+                            style="@style/MoneroText"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@color/dotGray"
+                            android:drawableEnd="@drawable/ic_content_copy_white_24dp"
+                            android:drawablePadding="16dp"
+                            android:paddingBottom="8dp"
+                            android:paddingEnd="8dp"
+                            android:paddingStart="24dp"
+                            android:paddingTop="8dp"
+                            android:textColor="@color/white"
+                            tools:text="XMR.TO-d2KQ" />
+
+                        <TextView
+                            style="@style/MoneroText.Medium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
+                            android:gravity="center_vertical"
+                            android:text="@string/label_send_btc_xmrto_info" />
+
+                        <TextView
+                            style="@style/MoneroText.Confirm.Label"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="8dp"
+                            android:layout_marginTop="16dp"
+                            android:text="@string/label_send_btc_address"
+                            android:textAlignment="textStart" />
+
+                        <TextView
+                            android:id="@+id/tvTxBtcAddress"
+                            style="@style/MoneroText"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAlignment="textStart"
+                            tools:text="mpQ84J43EURZHkCnXbyQ4PpNDLLBqdsMW2" />
+                    </LinearLayout>
+                </FrameLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginTop="8dp"
+                    android:background="@android:color/darker_gray" />
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <com.m2049r.xmrwallet.widget.SendProgressView
+                        android:id="@+id/evStageB"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center" />
+
+                    <LinearLayout
+                        android:id="@+id/llStageB"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:orientation="vertical"
+                        android:visibility="invisible">
+
+                        <TextView
+                            style="@style/MoneroText.Confirm.Label"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="8dp"
+                            android:text="@string/label_send_btc_amount"
+                            android:textAlignment="textStart" />
+
+                        <TextView
+                            android:id="@+id/tvTxBtcAmount"
+                            style="@style/MoneroText"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAlignment="textStart"
+                            tools:text="1.75 BTC = 84.118438761777 XMR" />
+
+                        <TextView
+                            android:id="@+id/tvTxBtcRate"
+                            style="@style/MoneroLabel.Gray"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAlignment="textStart"
+                            android:textSize="16sp"
+                            tools:text="(Rate: 0.020804 BTC/XMR)" />
+                    </LinearLayout>
+                </FrameLayout>
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:layout_marginStart="16dp">
+
+            <com.m2049r.xmrwallet.widget.SendProgressView
+                android:id="@+id/evStageC"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center" />
+
+            <LinearLayout
+                android:id="@+id/llStageC"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:orientation="vertical"
+                android:visibility="invisible">
 
                 <LinearLayout
-                    android:id="@+id/llStageA"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:orientation="vertical"
-                    android:visibility="invisible">
+                    android:layout_marginTop="4dp"
+                    android:orientation="horizontal"
+                    android:weightSum="3">
 
                     <TextView
-                        style="@style/MoneroText.Confirm.Label"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
-                        android:drawablePadding="8dp"
-                        android:drawableStart="@drawable/ic_xmrto_32dp"
-                        android:gravity="center_vertical"
-                        android:text="@string/label_send_btc_xmrto_key" />
-
-                    <TextView
-                        android:id="@+id/tvTxXmrToKey"
-                        style="@style/MoneroText"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@color/dotGray"
-                        android:drawableEnd="@drawable/ic_content_copy_white_24dp"
-                        android:drawablePadding="16dp"
-                        android:paddingBottom="8dp"
-                        android:paddingEnd="8dp"
-                        android:paddingStart="24dp"
-                        android:paddingTop="8dp"
-                        android:textColor="@color/white"
-                        tools:text="XMR.TO-d2KQ" />
-
-                    <TextView
-                        style="@style/MoneroText.Medium"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:gravity="center_vertical"
-                        android:text="@string/label_send_btc_xmrto_info" />
-
-                    <TextView
-                        style="@style/MoneroText.Confirm.Label"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
-                        android:layout_marginTop="16dp"
-                        android:text="@string/label_send_btc_address"
-                        android:textAlignment="textStart" />
-
-                    <TextView
-                        android:id="@+id/tvTxBtcAddress"
-                        style="@style/MoneroText"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textAlignment="textStart"
-                        tools:text="mpQ84J43EURZHkCnXbyQ4PpNDLLBqdsMW2" />
-                </LinearLayout>
-            </FrameLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="@android:color/darker_gray" />
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <com.m2049r.xmrwallet.widget.SendProgressView
-                    android:id="@+id/evStageB"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center" />
-
-                <LinearLayout
-                    android:id="@+id/llStageB"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:orientation="vertical"
-                    android:visibility="invisible">
-
-                    <TextView
-                        style="@style/MoneroText.Confirm.Label"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
-                        android:text="@string/label_send_btc_amount"
-                        android:textAlignment="textStart" />
-
-                    <TextView
-                        android:id="@+id/tvTxBtcAmount"
-                        style="@style/MoneroText"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textAlignment="textStart"
-                        tools:text="1.75 BTC = 84.118438761777 XMR" />
-
-                    <TextView
-                        android:id="@+id/tvTxBtcRate"
+                        android:id="@+id/tvTxFeeLabel"
                         style="@style/MoneroLabel.Gray"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/send_fee_btc_label"
                         android:textAlignment="textStart"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:id="@+id/tvTxFee"
+                        style="@style/MoneroText.Gray"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:textAlignment="textEnd"
                         android:textSize="16sp"
-                        tools:text="(Rate: 0.020804 BTC/XMR)" />
+                        tools:text="0.006817000000" />
                 </LinearLayout>
-            </FrameLayout>
-        </LinearLayout>
-    </android.support.v7.widget.CardView>
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:layout_marginStart="16dp">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:orientation="horizontal"
+                    android:weightSum="3">
 
-        <com.m2049r.xmrwallet.widget.SendProgressView
-            android:id="@+id/evStageC"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center" />
+                    <TextView
+                        android:id="@+id/tvTxTotalLabel"
+                        style="@style/MoneroLabel.Caps.Black"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/send_total_btc_label"
+                        android:textAlignment="textStart"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:id="@+id/tvTxTotal"
+                        style="@style/MoneroText.Black"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:textAlignment="textEnd"
+                        android:textSize="16sp"
+                        tools:text="143.014817000000" />
+                </LinearLayout>
+            </LinearLayout>
+        </FrameLayout>
 
         <LinearLayout
-            android:id="@+id/llStageC"
+            android:id="@+id/llConfirmSend"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:layout_marginTop="8dp"
             android:orientation="vertical"
             android:visibility="invisible">
 
-            <LinearLayout
+            <Button
+                android:id="@+id/bSend"
+                style="@style/MoneroButton.Green"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:orientation="horizontal"
-                android:weightSum="3">
+                android:layout_marginTop="8dp"
+                android:enabled="true"
+                android:padding="8dp"
+                android:text="@string/send_send_label" />
 
-                <TextView
-                    android:id="@+id/tvTxFeeLabel"
-                    style="@style/MoneroLabel.Gray"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/send_fee_btc_label"
-                    android:textAlignment="textStart"
-                    android:textSize="16sp" />
-
-                <TextView
-                    android:id="@+id/tvTxFee"
-                    style="@style/MoneroText.Gray"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="2"
-                    android:textAlignment="textEnd"
-                    android:textSize="16sp"
-                    tools:text="0.006817000000" />
-            </LinearLayout>
-
-            <LinearLayout
+            <ProgressBar
+                android:id="@+id/pbProgressSend"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:orientation="horizontal"
-                android:weightSum="3">
-
-                <TextView
-                    android:id="@+id/tvTxTotalLabel"
-                    style="@style/MoneroLabel.Caps.Black"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/send_total_btc_label"
-                    android:textAlignment="textStart"
-                    android:textSize="16sp" />
-
-                <TextView
-                    android:id="@+id/tvTxTotal"
-                    style="@style/MoneroText.Black"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="2"
-                    android:textAlignment="textEnd"
-                    android:textSize="16sp"
-                    tools:text="143.014817000000" />
-            </LinearLayout>
+                android:layout_marginTop="8dp"
+                android:indeterminate="true"
+                android:visibility="invisible" />
         </LinearLayout>
-    </FrameLayout>
 
-    <LinearLayout
-        android:id="@+id/llConfirmSend"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:orientation="vertical"
-        android:visibility="invisible">
-
-        <Button
-            android:id="@+id/bSend"
-            style="@style/MoneroButton.Green"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:enabled="true"
-            android:padding="8dp"
-            android:text="@string/send_send_label" />
-
-        <ProgressBar
-            android:id="@+id/pbProgressSend"
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:indeterminate="true"
-            android:visibility="invisible" />
     </LinearLayout>
-
-</LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_send_confirm.xml b/app/src/main/res/layout/fragment_send_confirm.xml
index efc5e14..145d5cb 100644
--- a/app/src/main/res/layout/fragment_send_confirm.xml
+++ b/app/src/main/res/layout/fragment_send_confirm.xml
@@ -1,199 +1,204 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView
-        style="@style/MoneroText.Confirm.Label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/label_send_address"
-        android:textAlignment="textStart" />
-
-    <TextView
-        android:id="@+id/tvTxAddress"
-        style="@style/MoneroText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginTop="8dp"
-        android:textAlignment="textStart"
-        tools:text="4AdkPJoxn7JCvAby9szgnt93MSEwdnxdhaASxbTBm6x5dCwmsDep2UYN4FhStDn5i11nsJbpU7oj59ahg8gXb1Mg3viqCuk" />
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:orientation="horizontal">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
         <TextView
             style="@style/MoneroText.Confirm.Label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/label_send_payment_id"
+            android:text="@string/label_send_address"
             android:textAlignment="textStart" />
 
         <TextView
-            android:id="@+id/tvTxPaymentId"
-            style="@style/MoneroText.Confirm"
+            android:id="@+id/tvTxAddress"
+            style="@style/MoneroText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginTop="8dp"
             android:textAlignment="textStart"
-            tools:text="d666a38d4a28fb38" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:orientation="horizontal">
-
-        <TextView
-            style="@style/MoneroText.Confirm.Label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/label_send_notes"
-            android:textAlignment="textStart" />
-
-        <TextView
-            android:id="@+id/tvTxNotes"
-            style="@style/MoneroText.Confirm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:textAlignment="textStart"
-            tools:text="gunegugumobil" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/llProgress"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:orientation="vertical"
-        android:visibility="visible">
-
-        <ProgressBar
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:indeterminate="true" />
-
-        <TextView
-            android:id="@+id/tvPaymentIdIntegrated"
-            style="@style/MoneroText.Info"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/info_prepare_tx" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/llConfirmSend"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:orientation="vertical"
-        android:visibility="invisible">
+            tools:text="4AdkPJoxn7JCvAby9szgnt93MSEwdnxdhaASxbTBm6x5dCwmsDep2UYN4FhStDn5i11nsJbpU7oj59ahg8gXb1Mg3viqCuk" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
             android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/tvTxAmountLabel"
-                style="@style/MoneroLabel.Gray"
-                android:layout_width="0dp"
+                style="@style/MoneroText.Confirm.Label"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/send_amount_label"
+                android:text="@string/label_send_payment_id"
                 android:textAlignment="textStart" />
 
             <TextView
-                android:id="@+id/tvTxAmount"
-                style="@style/MoneroText.Gray"
-                android:layout_width="0dp"
+                android:id="@+id/tvTxPaymentId"
+                style="@style/MoneroText.Confirm"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:textAlignment="textEnd"
-                tools:text="143.008000000000" />
+                android:layout_marginStart="8dp"
+                android:textAlignment="textStart"
+                tools:text="d666a38d4a28fb38" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
-            android:orientation="horizontal"
-            android:weightSum="3">
+            android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/tvTxFeeLabel"
-                style="@style/MoneroLabel.Gray"
-                android:layout_width="0dp"
+                style="@style/MoneroText.Confirm.Label"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/send_fee_label"
+                android:text="@string/label_send_notes"
                 android:textAlignment="textStart" />
 
             <TextView
-                android:id="@+id/tvTxFee"
-                style="@style/MoneroText.Gray"
-                android:layout_width="0dp"
+                android:id="@+id/tvTxNotes"
+                style="@style/MoneroText.Confirm"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:textAlignment="textEnd"
-                tools:text="0.006817000000" />
+                android:layout_marginStart="8dp"
+                android:textAlignment="textStart"
+                tools:text="gunegugumobil" />
         </LinearLayout>
 
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:orientation="horizontal"
-            android:weightSum="3">
-
-            <TextView
-                android:id="@+id/tvTxTotalLabel"
-                style="@style/MoneroLabel.Caps.Black"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/send_total_label"
-                android:textAlignment="textStart" />
-
-            <TextView
-                android:id="@+id/tvTxTotal"
-                style="@style/MoneroText.Black"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:textAlignment="textEnd"
-                tools:text="143.014817000000" />
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/bSend"
-            style="@style/MoneroButton.Green"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="48dp"
-            android:enabled="true"
-            android:padding="8dp"
-            android:text="@string/send_send_label" />
-
-        <ProgressBar
-            android:id="@+id/pbProgressSend"
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            android:id="@+id/llProgress"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:indeterminate="true"
-            android:visibility="invisible" />
+            android:orientation="vertical"
+            android:visibility="visible">
+
+            <ProgressBar
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:indeterminate="true" />
+
+            <TextView
+                android:id="@+id/tvPaymentIdIntegrated"
+                style="@style/MoneroText.Info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/info_prepare_tx" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/llConfirmSend"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:orientation="vertical"
+            android:visibility="invisible">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/tvTxAmountLabel"
+                    style="@style/MoneroLabel.Gray"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/send_amount_label"
+                    android:textAlignment="textStart" />
+
+                <TextView
+                    android:id="@+id/tvTxAmount"
+                    style="@style/MoneroText.Gray"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:textAlignment="textEnd"
+                    tools:text="143.008000000000" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:orientation="horizontal"
+                android:weightSum="3">
+
+                <TextView
+                    android:id="@+id/tvTxFeeLabel"
+                    style="@style/MoneroLabel.Gray"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/send_fee_label"
+                    android:textAlignment="textStart" />
+
+                <TextView
+                    android:id="@+id/tvTxFee"
+                    style="@style/MoneroText.Gray"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:textAlignment="textEnd"
+                    tools:text="0.006817000000" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:orientation="horizontal"
+                android:weightSum="3">
+
+                <TextView
+                    android:id="@+id/tvTxTotalLabel"
+                    style="@style/MoneroLabel.Caps.Black"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/send_total_label"
+                    android:textAlignment="textStart" />
+
+                <TextView
+                    android:id="@+id/tvTxTotal"
+                    style="@style/MoneroText.Black"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:textAlignment="textEnd"
+                    tools:text="143.014817000000" />
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/bSend"
+                style="@style/MoneroButton.Green"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="48dp"
+                android:enabled="true"
+                android:padding="8dp"
+                android:text="@string/send_send_label" />
+
+            <ProgressBar
+                android:id="@+id/pbProgressSend"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:indeterminate="true"
+                android:visibility="invisible" />
+
+        </LinearLayout>
 
     </LinearLayout>
-
-</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_send_new.xml b/app/src/main/res/layout/fragment_send_new.xml
deleted file mode 100644
index db486c5..0000000
--- a/app/src/main/res/layout/fragment_send_new.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <EditText
-        android:id="@+id/etDummy"
-        android:layout_width="0dp"
-        android:layout_height="0dp" />
-
-    <com.m2049r.xmrwallet.layout.SpendViewPager
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/llNavBar"
-        android:padding="8dp" />
-
-    <LinearLayout
-        android:id="@+id/llNavBar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_gravity="bottom"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/bPrev"
-            style="@style/MoneroButton"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:drawableStart="@drawable/ic_navigate_prev_white_24dp"
-            tools:text="Back" />
-
-        <com.m2049r.xmrwallet.widget.DotBar
-            android:id="@+id/dotBar"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:background="@color/gradientOrange"
-            app:activeColor="@color/white"
-            app:activeDot="0"
-            app:dotSize="12dp"
-            app:inactiveColor="@color/dotGray"
-            app:numberDots="4" />
-
-        <Button
-            android:id="@+id/bNext"
-            style="@style/MoneroButton"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:drawableEnd="@drawable/ic_navigate_next_white_24dp"
-            tools:text="Next" />
-    </LinearLayout>
-
-    <Button
-        android:id="@+id/bDone"
-        style="@style/MoneroButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_gravity="bottom"
-        android:text="@string/label_send_done"
-        android:visibility="gone" />
-
-</RelativeLayout>
diff --git a/app/src/main/res/values/about.xml b/app/src/main/res/values/about.xml
index 526c9a5..d94244e 100644
--- a/app/src/main/res/values/about.xml
+++ b/app/src/main/res/values/about.xml
@@ -43,6 +43,9 @@
         See their privacy policy at https://www.kraken.com/legal/privacy for
         details on how data in your requests is collected (especially the
         section "Information We Collect Automatically").</p>
+        <p>If you use the app to pay to BTC addresses, you will be using the XMR.TO service.
+        See their privacy policy at https://xmr.to/ for details. Monerujo send them the BTC
+        destination address and amount. Your IP will also be collectable.</p>
         <h2>App Permissions</h2>
         <ul>
         <li>INTERNET : Connect to the Monero Network via a Monero Daemon Node</li>