fix: Overflow issue in blockchain accounts list

TalaoDAO · Jul 3, 2024 · 2dd14c5 · 2dd14c5
1 parent 2d95316
commit 2dd14c5
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 49 deletions.
diff --git a/lib/dashboard/drawer/blockchain_settings/manage_accounts/widgets/manage_accounts_item.dart b/lib/dashboard/drawer/blockchain_settings/manage_accounts/widgets/manage_accounts_item.dart
@@ -35,7 +35,6 @@ class ManageAccountsItem extends StatelessWidget {
     return BackgroundCard(
       child: Container(
         margin: const EdgeInsets.only(bottom: Sizes.spaceSmall),
-        padding: const EdgeInsets.symmetric(horizontal: Sizes.spaceSmall),
         child: Column(
           mainAxisSize: MainAxisSize.min,
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -114,50 +113,51 @@ class ManageAccountsItem extends StatelessWidget {
             Row(
               mainAxisSize: MainAxisSize.min,
               children: [
-                SeeAddressButton(
-                  onTap: () {
-                    Navigator.of(context).push<void>(
-                      AccountPublicAddressPage.route(
-                        accountName: accountName,
-                        accountAddress: cryptoAccountData.walletAddress,
-                      ),
-                    );
-                  },
+                Expanded(
+                  child: SeeAddressButton(
+                    onTap: () {
+                      Navigator.of(context).push<void>(
+                        AccountPublicAddressPage.route(
+                          accountName: accountName,
+                          accountAddress: cryptoAccountData.walletAddress,
+                        ),
+                      );
+                    },
+                  ),
                 ),
                 const SizedBox(width: Sizes.spaceSmall),
-                RevealPrivateKeyButton(
-                  onTap: () async {
-                    final confirm = await showDialog<bool>(
-                          context: context,
-                          builder: (context) => ConfirmDialog(
-                            title: l10n.warningDialogTitle,
-                            subtitle: l10n.accountPrivateKeyAlert,
-                            yes: l10n.showDialogYes,
-                            no: l10n.showDialogNo,
-                          ),
-                        ) ??
-                        false;
-
-                    if (confirm) {
-                      await securityCheck(
-                        context: context,
-                        localAuthApi: LocalAuthApi(),
-                        onSuccess: () {
-                          Navigator.of(context).push<void>(
-                            AccountPrivateKeyPage.route(
-                              privateKey: cryptoAccountData.secretKey,
+                Expanded(
+                  child: RevealPrivateKeyButton(
+                    onTap: () async {
+                      final confirm = await showDialog<bool>(
+                            context: context,
+                            builder: (context) => ConfirmDialog(
+                              title: l10n.warningDialogTitle,
+                              subtitle: l10n.accountPrivateKeyAlert,
+                              yes: l10n.showDialogYes,
+                              no: l10n.showDialogNo,
                             ),
-                          );
-                        },
-                      );
-                    }
-                  },
+                          ) ??
+                          false;
+
+                      if (confirm) {
+                        await securityCheck(
+                          context: context,
+                          localAuthApi: LocalAuthApi(),
+                          onSuccess: () {
+                            Navigator.of(context).push<void>(
+                              AccountPrivateKeyPage.route(
+                                privateKey: cryptoAccountData.secretKey,
+                              ),
+                            );
+                          },
+                        );
+                      }
+                    },
+                  ),
                 ),
               ],
             ),
-            const SizedBox(
-              height: Sizes.spaceSmall,
-            ),
           ],
         ),
       ),

diff --git a/...shboard/drawer/blockchain_settings/manage_accounts/widgets/reveal_private_key_button.dart b/...shboard/drawer/blockchain_settings/manage_accounts/widgets/reveal_private_key_button.dart
@@ -31,11 +31,13 @@ class RevealPrivateKeyButton extends StatelessWidget {
               width: Sizes.icon,
               color: Theme.of(context).colorScheme.onSurface,
             ),
-            Text(
-              l10n.revealPrivateKey.toUpperCase(),
-              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                    color: Theme.of(context).colorScheme.onSurface,
-                  ),
+            Expanded(
+              child: MyText(
+                l10n.revealPrivateKey.toUpperCase(),
+                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                      color: Theme.of(context).colorScheme.onSurface,
+                    ),
+              ),
             ),
           ],
         ),

diff --git a/lib/dashboard/drawer/blockchain_settings/manage_accounts/widgets/see_address_button.dart b/lib/dashboard/drawer/blockchain_settings/manage_accounts/widgets/see_address_button.dart
@@ -35,11 +35,13 @@ class SeeAddressButton extends StatelessWidget {
                 color: Theme.of(context).colorScheme.onPrimaryContainer,
               ),
             ),
-            Text(
-              l10n.seeAddress.toUpperCase(),
-              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                    color: Theme.of(context).colorScheme.onPrimaryContainer,
-                  ),
+            Expanded(
+              child: MyText(
+                l10n.seeAddress.toUpperCase(),
+                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                      color: Theme.of(context).colorScheme.onPrimaryContainer,
+                    ),
+              ),
             ),
           ],
         ),