diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
index 11ab269e93..74012de29c 100644
--- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
@@ -112,7 +112,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
         if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED == intent.action || NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action)) {
             val tag = intent.getParcelableExtra<Tag>(NfcAdapter.EXTRA_TAG)
             if (tag != null && onNfcReaderCallback != null) {
-                onNfcReaderCallback!!.onTagDiscovered(tag)
+                onNfcReaderCallback?.onTagDiscovered(tag)
             }
         }
 
@@ -231,7 +231,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
             lastTag = tag
 
             readCardInfoTask = ReadCardInfoTask(NfcReader(nfcManager, isoDep), App.localStorage, App.pinStorage, this)
-            readCardInfoTask!!.start()
+            readCardInfoTask?.start()
 
             LOG.i(TAG, "onTagDiscovered " + Arrays.toString(tag.id))
 
diff --git a/app/src/main/res/layout/activity_confirm_transaction.xml b/app/src/main/res/layout/activity_confirm_transaction.xml
index 8f7dcc5929..acb261225c 100644
--- a/app/src/main/res/layout/activity_confirm_transaction.xml
+++ b/app/src/main/res/layout/activity_confirm_transaction.xml
@@ -106,7 +106,7 @@
             android:enabled="false"
             android:fontFamily="@font/maax"
             android:hint="@string/target_wallet_address"
-            android:inputType="text"
+            android:inputType="textMultiLine"
             android:maxLines="2"
             android:padding="12dp"
             android:singleLine="false"
@@ -270,6 +270,7 @@
                 android:fontFamily="@font/maax"
                 android:hint="@string/fee_amount"
                 android:inputType="numberDecimal"
+                android:padding="12dp"
                 android:textColor="@color/black"
                 android:textColorLink="@android:color/holo_blue_dark"
                 android:textSize="@dimen/text_size_medium"