Skip to content

Commit 0143aeb

Browse files
authored
Merge branch 'staging' into killswitch
2 parents b6e11b6 + df21a67 commit 0143aeb

File tree

15 files changed

+1937
-1840
lines changed

15 files changed

+1937
-1840
lines changed

lib/models/node_model.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ class NodeModel {
4343
final bool torEnabled;
4444
// @HiveField(12)
4545
final bool clearnetEnabled;
46+
// @HiveField(13)
47+
final bool forceNoTor;
4648

4749
NodeModel({
4850
required this.host,
@@ -56,6 +58,7 @@ class NodeModel {
5658
required this.isDown,
5759
required this.torEnabled,
5860
required this.clearnetEnabled,
61+
this.forceNoTor = false,
5962
this.loginName,
6063
this.trusted,
6164
});
@@ -72,6 +75,7 @@ class NodeModel {
7275
bool? isDown,
7376
required bool? trusted,
7477
bool? torEnabled,
78+
bool? forceNoTor,
7579
bool? clearnetEnabled,
7680
}) {
7781
return NodeModel(
@@ -88,6 +92,7 @@ class NodeModel {
8892
trusted: trusted,
8993
torEnabled: torEnabled ?? this.torEnabled,
9094
clearnetEnabled: clearnetEnabled ?? this.clearnetEnabled,
95+
forceNoTor: forceNoTor ?? this.forceNoTor,
9196
);
9297
}
9398

@@ -111,6 +116,7 @@ class NodeModel {
111116
map['trusted'] = trusted;
112117
map['torEnabled'] = torEnabled;
113118
map['clearEnabled'] = clearnetEnabled;
119+
map['forceNoTor'] = forceNoTor;
114120
return map;
115121
}
116122

lib/models/type_adaptors/node_model.g.dart

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ class _NameYourWalletViewState extends ConsumerState<NameYourWalletView> {
322322
)
323323
: Semantics(
324324
label:
325-
"Generate Random Wallet Name Button. Generates A Random Name For Wallet.",
325+
"Clear Wallet Name Field Button. Clears the wallet name field.",
326326
excludeSemantics: true,
327327
child: XIcon(
328328
width: isDesktop ? 21 : 18,

0 commit comments

Comments
 (0)