From d3a1464775911dcffa6dc912d04fad8e7c1d168b Mon Sep 17 00:00:00 2001
From: malik1004x <malikowskirobert@gmail.com>
Date: Thu, 25 Jun 2026 11:29:42 +0200
Subject: [PATCH] improve address rotation button ui + fix bug when
 autogenerate is disabled (#3334)

* improve address rotation button ui + fix bug when autogenerate is disabled

* remove dumbass debug print

* add button show condition
---
 lib/new-ui/pages/receive_page.dart            | 50 +++++++++++--------
 .../wallet_address_list_view_model.dart       | 13 ++++-
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/lib/new-ui/pages/receive_page.dart b/lib/new-ui/pages/receive_page.dart
index 9ad2d7d2f..84d1e935a 100644
--- a/lib/new-ui/pages/receive_page.dart
+++ b/lib/new-ui/pages/receive_page.dart
@@ -1,6 +1,7 @@
 import 'package:cake_wallet/core/utilities.dart';
 import 'package:cake_wallet/entities/auto_generate_subaddress_status.dart';
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/new-ui/widgets/modern_button.dart';
 import 'package:cake_wallet/new-ui/widgets/receive_page/payjoin_copy_modal.dart';
 import 'package:cake_wallet/new-ui/widgets/receive_page/receive_address_type.dart';
 import 'package:cake_wallet/new-ui/widgets/receive_page/receive_address_widget.dart';
@@ -22,6 +23,7 @@ import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/payment_uris.dart';
 import 'package:cw_core/receive_page_option.dart';
 import 'package:cw_core/utils/print_verbose.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:mobx/mobx.dart';
 import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
@@ -194,29 +196,37 @@ class _NewReceivePageState extends State<NewReceivePage> {
             ModalTopBar(
               title: _largeQrMode ? "" : S.of(context).receive,
               leadingIcon: Icon(Icons.close),
-              trailingIcon: _largeQrMode
-                  ? Icon(Icons.share)
-                  : widget.addressListViewModel.hasAddressRotation
-                          /* TODO rotating is broken on mweb, disabling for now, fix after mvp*/
-                          &&
-                          !(widget.receiveOptionViewModel.selectedReceiveOption.description ?? "")
-                              .toLowerCase()
-                              .contains("mweb")
-                      ? Icon(Icons.refresh)
-                      : null,
               onLeadingPressed: () {
                 Navigator.of(context, rootNavigator: true).pop();
               },
-              onTrailingPressed: () {
-                if (_largeQrMode) {
-                  ShareUtil.share(
-                    text: widget.addressListViewModel.uri.toString(),
-                    context: context,
-                  );
-                } else if (widget.addressListViewModel.hasAddressRotation) {
-                  widget.addressListViewModel.rotateAddress();
-                }
-              },
+              trailingWidget: Observer(
+                builder: (_) => AnimatedSwitcher(
+                  duration: Duration(milliseconds: 300),
+                  child: _largeQrMode || widget.addressListViewModel.hasAddressRotation
+                      /* TODO rotating is broken on mweb, disabling for now, fix after mvp*/
+                      &&
+                      !(widget.receiveOptionViewModel.selectedReceiveOption.description ?? "")
+                          .toLowerCase()
+                          .contains("mweb") ? ModernButton(
+                    key: ValueKey(_largeQrMode),
+                      size: 36,
+                      icon: _largeQrMode ? Icon(Icons.share) : widget.addressListViewModel.isRotatingAddress
+                          ? CupertinoActivityIndicator()
+                          : Icon(Icons.refresh),
+                      onPressed: () {
+                        if(_largeQrMode) {
+                              ShareUtil.share(
+                                text: widget.addressListViewModel.uri.toString(),
+                                context: context,
+                              );
+                        } else {
+                          if(widget.addressListViewModel.hasAddressRotation) {
+                            widget.addressListViewModel.rotateAddress();
+                          }
+                        }
+                      }):SizedBox.shrink(),
+                ),
+              ),
             ),
             Expanded(
               child: Column(
diff --git a/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart b/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart
index f097e5d12..b69558bff 100644
--- a/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart
+++ b/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart
@@ -614,11 +614,20 @@ abstract class WalletAddressListViewModelBase extends WalletChangeListenerViewMo
   void setAddress(WalletAddressListItem address) =>
       wallet.walletAddresses.address = address.address;
 
+  @observable
+  bool isRotatingAddress = false;
+
   @action
   Future<void> rotateAddress() async {
-    await createNewAddress(wallet, "");
-    if (isElectrumWallet) {
+    if(isRotatingAddress) {
+      return;
+    }
+    try {
+      isRotatingAddress = true;
+      await createNewAddress(wallet, "");
       wallet.walletAddresses.address = addressList.whereType<WalletAddressListItem>().last.address;
+    } finally {
+      isRotatingAddress = false;
     }
   }