Public commit record
28/100 · Opaque
What the developer wrote
Authored by julian
clean up merge conflicts
✓ Subject identifies a change! No meaningful explanatory body
What changed, and why it matters
This commit is purely cosmetic code cleanup after resolving a merge conflict. It reorders two import statements in each file and reformats some Dart code (line breaks, spacing, trailing commas) without changing any logic, behavior, or security controls. There is no security-relevant change.
Recommended action
No security action needed. This is a routine formatting/import-order cleanup commit.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The diff shows only formatting and import-order changes. In restore_view_only_wallet_view.dart, imports for stack_text_field.dart and options.dart are swapped; code is reformatted with trailing commas and adjusted whitespace; some SizedBox and conditional expressions are rewritten across lines but remain functionally identical. In wallet_view.dart, imports for signing_view.dart and spark_view_key_view.dart are swapped. No functional code, validation, cryptography, or access-control logic is modified.
Changed components
lib/pages/add_wallet_views/restore_wallet_view/restore_view_only_wallet_view.dartlib/pages/wallet_view/wallet_view.dartInspect captured patch +30 / −32
diff --git a/lib/pages/add_wallet_views/restore_wallet_view/restore_view_only_wallet_view.dart b/lib/pages/add_wallet_views/restore_wallet_view/restore_view_only_wallet_view.dart
index 6c73f9b..b4a6953 100644
--- a/lib/pages/add_wallet_views/restore_wallet_view/restore_view_only_wallet_view.dart
+++ b/lib/pages/add_wallet_views/restore_wallet_view/restore_view_only_wallet_view.dart
@@ -34,8 +34,8 @@ import '../../../widgets/custom_buttons/app_bar_icon_button.dart';
import '../../../widgets/desktop/desktop_app_bar.dart';
import '../../../widgets/desktop/desktop_scaffold.dart';
import '../../../widgets/desktop/primary_button.dart';
-import '../../../widgets/stack_text_field.dart';
import '../../../widgets/options.dart';
+import '../../../widgets/stack_text_field.dart';
import '../../home_view/home_view.dart';
import 'confirm_recovery_dialog.dart';
import 'sub_widgets/restore_failed_dialog.dart';
@@ -402,18 +402,19 @@ class _RestoreViewOnlyWalletViewState
"Single address",
"Extended pub key",
if (widget.coin is Firo)
- isDesktop ? "Spark View Key" : "View Key"
+ isDesktop ? "Spark View Key" : "View Key",
],
- onColor: Theme.of(context)
- .extension<StackColors>()!
- .popupBG,
- offColor: Theme.of(context)
- .extension<StackColors>()!
- .textFieldDefaultBG,
- selectedIndex: _walletType.index-1,
+ onColor: Theme.of(
+ context,
+ ).extension<StackColors>()!.popupBG,
+ offColor: Theme.of(
+ context,
+ ).extension<StackColors>()!.textFieldDefaultBG,
+ selectedIndex: _walletType.index - 1,
onValueChanged: (value) {
setState(() {
- _walletType = ViewOnlyWalletType.values[value+1];
+ _walletType =
+ ViewOnlyWalletType.values[value + 1];
});
},
decoration: BoxDecoration(
@@ -424,10 +425,9 @@ class _RestoreViewOnlyWalletViewState
),
),
),
- SizedBox(
- height: isDesktop ? 24 : 16,
- ),
- if (!isElectrumX || _walletType == ViewOnlyWalletType.addressOnly)
+ SizedBox(height: isDesktop ? 24 : 16),
+ if (!isElectrumX ||
+ _walletType == ViewOnlyWalletType.addressOnly)
FullTextField(
key: const Key("viewOnlyAddressRestoreFieldKey"),
label: "Address",
@@ -447,11 +447,9 @@ class _RestoreViewOnlyWalletViewState
}
},
),
- if (!isElectrumX)
- SizedBox(
- height: isDesktop ? 16 : 12,
- ),
- if (isElectrumX && _walletType == ViewOnlyWalletType.xPub)
+ if (!isElectrumX) SizedBox(height: isDesktop ? 16 : 12),
+ if (isElectrumX &&
+ _walletType == ViewOnlyWalletType.xPub)
DropdownButtonHideUnderline(
child: DropdownButton2<String>(
value: _currentDropDownValue,
@@ -519,11 +517,11 @@ class _RestoreViewOnlyWalletViewState
),
),
),
- if (isElectrumX && _walletType == ViewOnlyWalletType.xPub)
- SizedBox(
- height: isDesktop ? 16 : 12,
- ),
- if (!isElectrumX || _walletType == ViewOnlyWalletType.xPub)
+ if (isElectrumX &&
+ _walletType == ViewOnlyWalletType.xPub)
+ SizedBox(height: isDesktop ? 16 : 12),
+ if (!isElectrumX ||
+ _walletType == ViewOnlyWalletType.xPub)
FullTextField(
key: const Key("viewOnlyKeyRestoreFieldKey"),
label:
@@ -545,18 +543,18 @@ class _RestoreViewOnlyWalletViewState
},
),
if (_walletType == ViewOnlyWalletType.spark)
- SizedBox(
- height: isDesktop ? 16 : 12,
- ),
+ SizedBox(height: isDesktop ? 16 : 12),
if (_walletType == ViewOnlyWalletType.spark)
FullTextField(
- key: const Key("viewOnlySparkViewKeyRestoreFieldKey"),
+ key: const Key(
+ "viewOnlySparkViewKeyRestoreFieldKey",
+ ),
label: "Spark View Key",
controller: sparkViewKeyController,
onChanged: (value) {
- setState(() {
- _enableRestoreButton = value.isNotEmpty;
- });
+ setState(() {
+ _enableRestoreButton = value.isNotEmpty;
+ });
},
),
if (!isDesktop) const Spacer(),
diff --git a/lib/pages/wallet_view/wallet_view.dart b/lib/pages/wallet_view/wallet_view.dart
index a500414..a6fd191 100644
--- a/lib/pages/wallet_view/wallet_view.dart
+++ b/lib/pages/wallet_view/wallet_view.dart
@@ -104,8 +104,8 @@ import '../send_view/frost_ms/frost_send_view.dart';
import '../send_view/send_view.dart';
import '../settings_views/wallet_settings_view/wallet_network_settings_view/wallet_network_settings_view.dart';
import '../settings_views/wallet_settings_view/wallet_settings_view.dart';
-import '../signing/signing_view.dart';
import '../settings_views/wallet_settings_view/wallet_settings_wallet_settings/spark_view_key_view.dart';
+import '../signing/signing_view.dart';
import '../spark_names/spark_names_home_view.dart';
import '../token_view/my_tokens_view.dart';
import 'sub_widgets/transactions_list.dart';
Risk score
Our methodology →Why this scored 15/100
Human-validated context
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
No validated notes yet.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.