From 63b76df9ca80511bfa689309787fd3a975a0aeb1 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Tue, 16 Jan 2024 16:03:04 -0600
Subject: [PATCH] exchange flow recipient address from stack selection bugfix

---
 .../exchange_view/exchange_step_views/step_2_view.dart      | 6 ++++--
 .../subwidgets/desktop_choose_from_stack.dart               | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/pages/exchange_view/exchange_step_views/step_2_view.dart b/lib/pages/exchange_view/exchange_step_views/step_2_view.dart
index 7a7058648..95734e94c 100644
--- a/lib/pages/exchange_view/exchange_step_views/step_2_view.dart
+++ b/lib/pages/exchange_view/exchange_step_views/step_2_view.dart
@@ -224,8 +224,10 @@ class _Step2ViewState extends ConsumerState<Step2View> {
 
                                           _toController.text = wallet.info.name;
                                           model.recipientAddress = (await wallet
-                                                  .getCurrentReceivingAddress())!
-                                              .value;
+                                                      .getCurrentReceivingAddress())
+                                                  ?.value ??
+                                              wallet
+                                                  .info.cachedReceivingAddress;
 
                                           setState(() {
                                             enableNext =
diff --git a/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart b/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart
index e413b42ac..842026cbc 100644
--- a/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart
+++ b/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart
@@ -234,7 +234,10 @@ class _DesktopChooseFromStackState
                         CustomTextButton(
                           text: "Select wallet",
                           onTap: () async {
-                            final address = wallet.info.cachedReceivingAddress;
+                            final address =
+                                (await wallet.getCurrentReceivingAddress())
+                                        ?.value ??
+                                    wallet.info.cachedReceivingAddress;
 
                             if (mounted) {
                               Navigator.of(context).pop(