Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-225-pin-timeout

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',

lib/store/dashboard/trades_store.dart

@@ -31,13 +31,8 @@ abstract class TradesStoreBase with Store {
   void setTrade(Trade trade) => this.trade = trade;
 
   @action
-  Future<void> updateTradeList() async {
-    if (trade == null) {
-      return;
-    }
-
-    trades = tradesSource.values.map((trade) => TradeListItem(
-      trade: trade!,
-      settingsStore: settingsStore)).toList();
-  }
+  Future<void> updateTradeList() async => trades =
+      tradesSource.values.map((trade) => TradeListItem(
+          trade: trade,
+          settingsStore: settingsStore)).toList();
 }