From 6362f1e101e20f06de77d58ba17ac624bc824b95 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 23 May 2022 20:27:10 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../wallet/redux/middlewares/AppCurrencyMiddleware.kt |  2 +-
 .../wallet/ui/wallet/CurrencySelectionDialog.kt       | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/AppCurrencyMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/AppCurrencyMiddleware.kt
index cac8319b82..3c9c87e9f8 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/AppCurrencyMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/AppCurrencyMiddleware.kt
@@ -48,7 +48,7 @@ class AppCurrencyMiddleware(
                         fiatCurrenciesPrefStorage.save(currenciesList)
                         store.dispatchDialogShow(
                             AppDialog.CurrencySelectionDialog(
-                                currenciesList = storedFiatCurrencies.mapToUiModel(),
+                                currenciesList = currenciesList.mapToUiModel(),
                                 currentAppCurrency = appCurrencyProvider.invoke()
                             )
                         )
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt
index c5f4d87cde..deab5c4759 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt
@@ -23,12 +23,13 @@ object CurrencySelectionDialog {
             .setTitle(context.getString(R.string.details_row_title_currency))
             .setNegativeButton(context.getString(R.string.common_cancel)) { _, _ -> /* no-op */ }
             .setPositiveButton(context.getString(R.string.common_done)) { _, _ ->
-                val selectedCurrency = dialog.currenciesList[currentSelection]
-                store.dispatch(
-                    WalletAction.AppCurrencyAction.SelectAppCurrency(
-                        fiatCurrency = selectedCurrency
+                dialog.currenciesList.getOrNull(currentSelection)?.let { selectedCurrency ->
+                    store.dispatch(
+                        WalletAction.AppCurrencyAction.SelectAppCurrency(
+                            fiatCurrency = selectedCurrency
+                        )
                     )
-                )
+                }
             }
             .setOnDismissListener {
                 store.dispatchDialogHide()