From 23913c01dce5b0f9c254084fcece1eb725155a04 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Tue, 15 Mar 2022 10:31:45 +0200
Subject: [PATCH] Cw 53 allow renaming of currently selected account and
 subaddress (#291)

* fixed address cell background

* fixed account title padding

* fixed format
---
 .../monero_accounts/monero_account_list_page.dart      |  1 +
 .../screens/monero_accounts/widgets/account_tile.dart  |  2 +-
 lib/src/screens/receive/receive_page.dart              | 10 ++--------
 lib/src/screens/receive/widgets/address_cell.dart      |  8 ++++----
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/lib/src/screens/monero_accounts/monero_account_list_page.dart b/lib/src/screens/monero_accounts/monero_account_list_page.dart
index 47404e443..ff668eb65 100644
--- a/lib/src/screens/monero_accounts/monero_account_list_page.dart
+++ b/lib/src/screens/monero_accounts/monero_account_list_page.dart
@@ -82,6 +82,7 @@ class MoneroAccountListPage extends StatelessWidget {
                                       alignment: Alignment.center,
                                       children: <Widget>[
                                         ListView.separated(
+                                          padding: EdgeInsets.zero,
                                           controller: controller,
                                           separatorBuilder: (context, index) =>
                                           Container(
diff --git a/lib/src/screens/monero_accounts/widgets/account_tile.dart b/lib/src/screens/monero_accounts/widgets/account_tile.dart
index f07539333..2bb71f633 100644
--- a/lib/src/screens/monero_accounts/widgets/account_tile.dart
+++ b/lib/src/screens/monero_accounts/widgets/account_tile.dart
@@ -44,7 +44,7 @@ class AccountTile extends StatelessWidget {
       ),
     );
 
-    return isCurrent ? cell : Slidable(
+    return Slidable(
         key: Key(accountName),
         child: cell,
         actionPane: SlidableDrawerActionPane(),
diff --git a/lib/src/screens/receive/receive_page.dart b/lib/src/screens/receive/receive_page.dart
index fa9d6befe..5d37e507d 100644
--- a/lib/src/screens/receive/receive_page.dart
+++ b/lib/src/screens/receive/receive_page.dart
@@ -132,13 +132,7 @@ class ReceivePage extends BasePage {
                     isLight: currentTheme.type == ThemeType.light),
               ),
               Observer(
-                  builder: (_) => ClipRRect(
-                    borderRadius: BorderRadius.only(
-                        topLeft: Radius.circular(30),
-                        topRight: Radius.circular(30)),
-                    child: Container(
-                      color: Theme.of(context).textTheme.display2.decorationColor,
-                      child: ListView.separated(
+                  builder: (_) => ListView.separated(
                       padding: EdgeInsets.all(0),
                       separatorBuilder: (context, _) => Container(
                           height: 1, color: Theme.of(context).dividerColor),
@@ -213,7 +207,7 @@ class ReceivePage extends BasePage {
                               topRight: Radius.circular(30)),
                           child: cell,
                         );
-                      })))),
+                      })),
             ],
           ),
         ));
diff --git a/lib/src/screens/receive/widgets/address_cell.dart b/lib/src/screens/receive/widgets/address_cell.dart
index 25ceca92d..62962052f 100644
--- a/lib/src/screens/receive/widgets/address_cell.dart
+++ b/lib/src/screens/receive/widgets/address_cell.dart
@@ -70,9 +70,9 @@ class AddressCell extends StatelessWidget {
           ),
         ));
 
-    return (isCurrent || isPrimary)
-        ? cell
-        : Slidable(
+    return Container(
+          color: backgroundColor,
+          child: Slidable(
             key: Key(address),
             actionPane: SlidableDrawerActionPane(),
             child: cell,
@@ -82,6 +82,6 @@ class AddressCell extends StatelessWidget {
                     color: Colors.blue,
                     icon: Icons.edit,
                     onTap: () => onEdit?.call())
-              ]);
+              ]));
   }
 }