What the developer wrote
Authored by Julian
fix merge conflict bug
What changed, and why it matters
This commit fixes a Dart/Flutter UI layout bug caused by a merge conflict. A spacing widget (SizedBox) and a text container (RoundedWhiteContainer) were accidentally separated, so the text container was always shown instead of only for certain coin types. The fix wraps both inside the same conditional block so they appear together only when restoring specific wallet types (Chinese 25-word seed, Epiccash, or Mimblewimblecoin). It is a visual/layout correction, not a cryptographic or network security fix.
No security action required. Treat as a normal UI bug fix. If desired, verify the instructional text now appears only for the intended coin types during wallet restore.
Security signals we found
UI-only layout fix
No input validation, key derivation, or cryptographic changes
No network or storage code modified
No secrets, credentials, or entropy handling altered
Evidence from the diff
In restore_options_view.dart, a prior merge conflict left a SizedBox(height: …) outside the conditional and moved the RoundedWhiteContainer below the conditional, causing the instructional text container to render unconditionally. The patch re-indents the RoundedWhiteContainer so it is part of the same if (...) body as the SizedBox, restoring the intended conditional UI. No logic, validation, key handling, or network code is changed.
Changed components
lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dartInspect captured patch +14 / −15
diff --git a/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart b/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
index 1972ae5..1686eba 100644
--- a/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
+++ b/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
@@ -519,23 +519,22 @@ class _SeedRestoreOptionState extends ConsumerState<SeedRestoreOption> {
if (isCnAnd25 ||
widget.coin is Epiccash ||
widget.coin is Mimblewimblecoin)
- SizedBox(height: Util.isDesktop ? 16 : 8),
- RoundedWhiteContainer(
- child: Center(
- child: Text(
- ref.watch(_pIsUsingDate)
- ? "Choose the date you made the wallet (approximate is fine)"
- : "Enter the initial block height of the wallet",
- style: Util.isDesktop
- ? STextStyles.desktopTextExtraSmall(context).copyWith(
- color: Theme.of(
- context,
- ).extension<StackColors>()!.textSubtitle1,
- )
- : STextStyles.smallMed12(context).copyWith(fontSize: 10),
+ RoundedWhiteContainer(
+ child: Center(
+ child: Text(
+ ref.watch(_pIsUsingDate)
+ ? "Choose the date you made the wallet (approximate is fine)"
+ : "Enter the initial block height of the wallet",
+ style: Util.isDesktop
+ ? STextStyles.desktopTextExtraSmall(context).copyWith(
+ color: Theme.of(
+ context,
+ ).extension<StackColors>()!.textSubtitle1,
+ )
+ : STextStyles.smallMed12(context).copyWith(fontSize: 10),
+ ),
),
),
- ),
if (isCnAnd25 ||
widget.coin is Epiccash ||
widget.coin is Mimblewimblecoin)
Why this scored 19/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.