diff --git a/.idea/dictionaries/romanpotapov.xml b/.idea/dictionaries/romanpotapov.xml
new file mode 100644
index 0000000000..22eae8bc66
--- /dev/null
+++ b/.idea/dictionaries/romanpotapov.xml
@@ -0,0 +1,8 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="romanpotapov">
+    <words>
+      <w>blockchain</w>
+      <w>tangem</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt
index 4875ef6449..eeca408c37 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/DetailsFragment.kt
@@ -16,7 +16,7 @@ import org.rekotlin.StoreSubscriber
 
 class DetailsFragment : Fragment(R.layout.fragment_details), StoreSubscriber<DetailsState> {
 
-    var currencySelectionDialog = CurrencySelectionDialog()
+    private var currencySelectionDialog = CurrencySelectionDialog()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/states/SendState.kt b/app/src/main/java/com/tangem/tap/features/send/redux/states/SendState.kt
index c7af7809bd..7d3df6c928 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/states/SendState.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/states/SendState.kt
@@ -5,6 +5,7 @@ import com.tangem.blockchain.common.AmountType
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.common.extensions.isZero
 import com.tangem.tap.common.CurrencyConverter
+import com.tangem.tap.common.entities.TapCurrency
 import com.tangem.tap.features.send.redux.AmountAction
 import com.tangem.tap.store
 import org.rekotlin.StateType
@@ -59,7 +60,7 @@ enum class SendButtonState {
 data class AmountState(
         val viewAmountValue: String = BigDecimal.ZERO.toPlainString(),
         val viewBalanceValue: String = BigDecimal.ZERO.toPlainString(),
-        val mainCurrency: Value<MainCurrencyType> = Value(MainCurrencyType.FIAT, store.state.globalState.appCurrency),
+        val mainCurrency: Value<MainCurrencyType> = Value(MainCurrencyType.FIAT, TapCurrency.DEFAULT_FIAT_CURRENCY),
         val typeOfAmount: AmountType = AmountType.Coin,
         val amountToSendCrypto: BigDecimal = BigDecimal.ZERO,
         val balanceCrypto: BigDecimal = BigDecimal.ZERO,