From 7b74c415ac4bedf617ea3aeff4f18b7a50d1df03 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Tue, 30 Aug 2022 08:15:17 -0600
Subject: [PATCH 1/2] searched single base currency selection bugfix

---
 .../global_settings_view/currency_view.dart      | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/pages/settings_views/global_settings_view/currency_view.dart b/lib/pages/settings_views/global_settings_view/currency_view.dart
index 31bbe0fec..7cb3c51e2 100644
--- a/lib/pages/settings_views/global_settings_view/currency_view.dart
+++ b/lib/pages/settings_views/global_settings_view/currency_view.dart
@@ -31,7 +31,7 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
   final _searchFocusNode = FocusNode();
 
   void onTap(int index) {
-    if (index == 0 || current.isEmpty) {
+    if (currenciesWithoutSelected[index] == current || current.isEmpty) {
       // ignore if already selected currency
       return;
     }
@@ -212,7 +212,7 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
                                 "currencySelect_${currenciesWithoutSelected[index]}"),
                             child: RoundedContainer(
                               padding: const EdgeInsets.all(0),
-                              color: index == 0
+                              color: currenciesWithoutSelected[index] == current
                                   ? CFColors.selected
                                   : CFColors.white,
                               child: RawMaterialButton(
@@ -238,7 +238,9 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
                                           materialTapTargetSize:
                                               MaterialTapTargetSize.shrinkWrap,
                                           value: true,
-                                          groupValue: index == 0,
+                                          groupValue: currenciesWithoutSelected[
+                                                  index] ==
+                                              current,
                                           onChanged: (_) {
                                             onTap(index);
                                           },
@@ -253,7 +255,9 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
                                         children: [
                                           Text(
                                             currenciesWithoutSelected[index],
-                                            key: (index == 0)
+                                            key: (currenciesWithoutSelected[
+                                                        index] ==
+                                                    current)
                                                 ? const Key(
                                                     "selectedCurrencySettingsCurrencyText")
                                                 : null,
@@ -269,7 +273,9 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
                                                     currenciesWithoutSelected[
                                                         index]] ??
                                                 "",
-                                            key: (index == 0)
+                                            key: (currenciesWithoutSelected[
+                                                        index] ==
+                                                    current)
                                                 ? const Key(
                                                     "selectedCurrencySettingsCurrencyTextDescription")
                                                 : null,

From eade1d91aa1ba67317b760f5d805e68de729a818 Mon Sep 17 00:00:00 2001
From: ryleedavis <rylee@cypherstack.com>
Date: Tue, 30 Aug 2022 08:32:32 -0600
Subject: [PATCH 2/2] change build

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 44f2fdf43..c909eb58b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: Stack Wallet
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.4.35+43
+version: 1.4.36+44
 
 environment:
   sdk: ">=2.17.0 <3.0.0"