diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
index 4eca3395fe..d42f3bf384 100644
--- a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
@@ -177,7 +177,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber
.bold { append(receipt.willSentCrypto) }.append(" ")
.append(receipt.symbols.crypto).append(" ")
.append(getString(R.string.send_total_will_be_sent))
- totalLayout.tvWillBeSentValue.update(willSent)
+ totalLayout.tvWillBeSentValue.update(willSent.toString())
}
ReceiptLayoutType.CRYPTO -> {
@@ -197,7 +197,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber
append(" (fee: ${receipt.feeFiat} ")
append(receipt.symbols.fiat).append(")")
}
- totalLayout.tvWillBeSentValue.update(willSent)
+ totalLayout.tvWillBeSentValue.update(willSent.toString())
}
ReceiptLayoutType.TOKEN_FIAT -> {
val receipt = state.tokenFiat ?: return
@@ -219,7 +219,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber
append(receipt.willSentFeeCrypto).append(" ")
}
.append(mainLayout.context.getString(R.string.send_total_will_be_sent))
- totalLayout.tvWillBeSentValue.update(willSent)
+ totalLayout.tvWillBeSentValue.update(willSent.toString())
}
ReceiptLayoutType.TOKEN_CRYPTO -> {
val receipt = state.tokenCrypto ?: return
@@ -236,7 +236,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber
append(receipt.totalFiat).append(" ")
append(receipt.symbols.fiat)
}
- totalTokenLayout.tvTotalTokenCryptoValue.update(willSent)
+ totalTokenLayout.tvTotalTokenCryptoValue.update(willSent.toString())
}
}
}
diff --git a/app/src/main/res/layout/layout_receipt_total.xml b/app/src/main/res/layout/layout_receipt_total.xml
index b7f54a99ee..c24c9bff3c 100644
--- a/app/src/main/res/layout/layout_receipt_total.xml
+++ b/app/src/main/res/layout/layout_receipt_total.xml
@@ -28,60 +28,26 @@
android:textSize="20sp"
android:textStyle="bold" />
-
-
-
-
-
-
+ android:textAllCaps="true"
+ android:textSize="20sp"
+ android:textStyle="bold"
+ tools:text="usd" />
-
-
-
-
-
-
-
+ android:layout_marginTop="4dp"
+ android:text="@string/send_total_will_be_sent"
+ android:textColor="@color/darkGray1" />
@@ -101,36 +67,16 @@
android:textSize="14sp"
android:textStyle="bold" />
-
-
-
-
-
-
-
-
+ android:textAllCaps="true"
+ android:textColor="@color/darkGray1"
+ android:textSize="14sp"
+ android:textStyle="bold"
+ tools:text="usd" />
diff --git a/app/src/main/res/layout/layout_send_amount.xml b/app/src/main/res/layout/layout_send_amount.xml
index 0df63b41cc..4abed2bfd8 100644
--- a/app/src/main/res/layout/layout_send_amount.xml
+++ b/app/src/main/res/layout/layout_send_amount.xml
@@ -62,67 +62,33 @@
-
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="USD" />
-
-
-
-
-
-
-
-
-
-
-
-
-
+ app:layout_constraintTop_toBottomOf="@+id/flAmountToSend" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_send_receipt.xml b/app/src/main/res/layout/layout_send_receipt.xml
index 4b68177593..ed8665c225 100644
--- a/app/src/main/res/layout/layout_send_receipt.xml
+++ b/app/src/main/res/layout/layout_send_receipt.xml
@@ -17,32 +17,16 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
-
-
-
-
-
+ app:layout_constraintTop_toTopOf="parent"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ tools:text="75.00 usd" />
-
-
-
-
-
-
-
+ app:layout_constraintTop_toTopOf="@+id/tvReceiptFee"
+ android:textAllCaps="true"
+ android:textColor="@color/darkGray1"
+ android:textStyle="bold"
+ tools:text="0.03 usd" />