From 30517186221d292e0fa2e784fc3bc1b8ce097b12 Mon Sep 17 00:00:00 2001
From: Rafael Saes <git@saes.io>
Date: Wed, 12 Jul 2023 09:45:24 -0300
Subject: [PATCH] fix: merge fixes

---
 lib/src/widgets/address_text_field.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/widgets/address_text_field.dart b/lib/src/widgets/address_text_field.dart
index 3dcfe9ef6..f9812b669 100644
--- a/lib/src/widgets/address_text_field.dart
+++ b/lib/src/widgets/address_text_field.dart
@@ -155,7 +155,7 @@ class AddressTextField extends StatelessWidget {
                                 child: Image.asset(
                                   'assets/images/qr_code_icon.png',
                                   color: iconColor ??
-                                      Theme.of(context).dialogTheme.backgroundColor,
+                                      Theme.of(context).extension<SendPageTheme>()!.textFieldButtonIconColor,
                                 )),
                           ),
                         ))
@@ -183,7 +183,7 @@ class AddressTextField extends StatelessWidget {
                                 child: Image.asset(
                                   'assets/images/open_book.png',
                                   color: iconColor ??
-                                      Theme.of(context).dialogTheme.backgroundColor,
+                                      Theme.of(context).extension<SendPageTheme>()!.textFieldButtonIconColor,
                                 )),
                           ),
                         ))