diff --git a/assets/images/2.0x/privacy_menu.png b/assets/images/2.0x/privacy_menu.png new file mode 100644 index 000000000..488fad1cc Binary files /dev/null and b/assets/images/2.0x/privacy_menu.png differ diff --git a/assets/images/3.0x/privacy_menu.png b/assets/images/3.0x/privacy_menu.png new file mode 100644 index 000000000..8f872892d Binary files /dev/null and b/assets/images/3.0x/privacy_menu.png differ diff --git a/assets/images/privacy_menu.png b/assets/images/privacy_menu.png new file mode 100644 index 000000000..76f38fb9a Binary files /dev/null and b/assets/images/privacy_menu.png differ diff --git a/cw_core/lib/node.dart b/cw_core/lib/node.dart index ff1d6b051..1322c5b78 100644 --- a/cw_core/lib/node.dart +++ b/cw_core/lib/node.dart @@ -53,7 +53,7 @@ class Node extends HiveObject with Keyable { @HiveField(4) bool? useSSL; - @HiveField(5) + @HiveField(5, defaultValue: false) bool trusted; bool get isSSL => useSSL ?? false; diff --git a/lib/src/screens/dashboard/wallet_menu.dart b/lib/src/screens/dashboard/wallet_menu.dart index bc1f20a5d..1638c0bc4 100644 --- a/lib/src/screens/dashboard/wallet_menu.dart +++ b/lib/src/screens/dashboard/wallet_menu.dart @@ -21,6 +21,12 @@ class WalletMenu { height: 16, width: 16), handler: () => Navigator.of(context).pushNamed(Routes.walletList), ), + WalletMenuItem( + title: S.current.address_book_menu, + image: Image.asset('assets/images/open_book_menu.png', + height: 16, width: 16), + handler: () => Navigator.of(context).pushNamed(Routes.addressBook), + ), WalletMenuItem( title: S.current.security_and_backup, image: @@ -29,18 +35,12 @@ class WalletMenu { Navigator.of(context).pushNamed(Routes.securityBackupPage); }), WalletMenuItem( - title: S.current.privacy, + title: S.current.privacy_settings, image: - Image.asset('assets/images/eye_menu.png', height: 16, width: 16), + Image.asset('assets/images/privacy_menu.png', height: 16, width: 16), handler: () { Navigator.of(context).pushNamed(Routes.privacyPage); }), - WalletMenuItem( - title: S.current.address_book_menu, - image: Image.asset('assets/images/open_book_menu.png', - height: 16, width: 16), - handler: () => Navigator.of(context).pushNamed(Routes.addressBook), - ), WalletMenuItem( title: S.current.display_settings, image: Image.asset('assets/images/eye_menu.png', diff --git a/lib/store/dashboard/trades_store.dart b/lib/store/dashboard/trades_store.dart index 6e763196b..72442b46f 100644 --- a/lib/store/dashboard/trades_store.dart +++ b/lib/store/dashboard/trades_store.dart @@ -31,13 +31,8 @@ abstract class TradesStoreBase with Store { void setTrade(Trade trade) => this.trade = trade; @action - Future updateTradeList() async { - if (trade == null) { - return; - } - - trades = tradesSource.values.map((trade) => TradeListItem( - trade: trade!, - settingsStore: settingsStore)).toList(); - } + Future updateTradeList() async => trades = + tradesSource.values.map((trade) => TradeListItem( + trade: trade, + settingsStore: settingsStore)).toList(); } \ No newline at end of file