Merge branch 'ui-fixes' into fusion

ios/Runner.xcodeproj/project.pbxproj

@@ -61,6 +61,7 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B999088F2ABE1E170012A442 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		E6F536731AC506735EB76340 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -140,6 +141,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				B999088F2ABE1E170012A442 /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -321,8 +323,8 @@
 				"${BUILT_PRODUCTS_DIR}/package_info_plus/package_info_plus.framework",
 				"${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework",
 				"${BUILT_PRODUCTS_DIR}/share_plus/share_plus.framework",
-				"${BUILT_PRODUCTS_DIR}/shared_preferences_foundation/shared_preferences_foundation.framework",
 				"${BUILT_PRODUCTS_DIR}/stack_wallet_backup/stack_wallet_backup.framework",
+				"${BUILT_PRODUCTS_DIR}/tor_ffi_plugin/tor_ffi_plugin.framework",
 				"${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
 				"${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
 			);
@@ -354,8 +356,8 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info_plus.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share_plus.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_foundation.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/stack_wallet_backup.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/tor_ffi_plugin.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
 			);
@@ -455,6 +457,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -645,6 +648,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -727,6 +731,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";

ios/Runner/Runner.entitlements

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.network.server</key>
+	<true/>
+</dict>
+</plist>

lib/pages/token_view/token_view.dart

@@ -37,12 +37,14 @@ class TokenView extends ConsumerStatefulWidget {
   const TokenView({
     Key? key,
     required this.walletId,
+    this.popPrevious = false,
     this.eventBus,
   }) : super(key: key);
 
   static const String routeName = "/token";
 
   final String walletId;
+  final bool popPrevious;
   final EventBus? eventBus;
 
   @override
@@ -69,157 +71,172 @@ class _TokenViewState extends ConsumerState<TokenView> {
   Widget build(BuildContext context) {
     debugPrint("BUILD: $runtimeType");
 
-    return Background(
+    return WillPopScope(
-      child: Scaffold(
+      onWillPop: () async {
-        backgroundColor: Theme.of(context).extension<StackColors>()!.background,
+        final nav = Navigator.of(context);
-        appBar: AppBar(
+        if (widget.popPrevious) {
-          leading: AppBarBackButton(
+          nav.pop();
-            onPressed: () {
+        }
-              Navigator.of(context).pop();
+        nav.pop();
-            },
+        return false;
-          ),
+      },
-          centerTitle: true,
+      child: Background(
-          title: Row(
+        child: Scaffold(
-            mainAxisAlignment: MainAxisAlignment.center,
+          backgroundColor:
-            mainAxisSize: MainAxisSize.min,
+              Theme.of(context).extension<StackColors>()!.background,
-            children: [
+          appBar: AppBar(
-              Expanded(
+            leading: AppBarBackButton(
-                child: Row(
+              onPressed: () {
-                  mainAxisAlignment: MainAxisAlignment.center,
+                final nav = Navigator.of(context);
-                  children: [
+                if (widget.popPrevious) {
-                    EthTokenIcon(
+                  nav.pop();
-                      contractAddress: ref.watch(
+                }
-                        tokenServiceProvider.select(
+                nav.pop();
-                          (value) => value!.tokenContract.address,
+              },
+            ),
+            centerTitle: true,
+            title: Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Expanded(
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      EthTokenIcon(
+                        contractAddress: ref.watch(
+                          tokenServiceProvider.select(
+                            (value) => value!.tokenContract.address,
+                          ),
+                        ),
+                        size: 24,
+                      ),
+                      const SizedBox(
+                        width: 10,
+                      ),
+                      Flexible(
+                        child: Text(
+                          ref.watch(tokenServiceProvider
+                              .select((value) => value!.tokenContract.name)),
+                          style: STextStyles.navBarTitle(context),
+                          overflow: TextOverflow.ellipsis,
+                          textAlign: TextAlign.center,
                         ),
                       ),
-                      size: 24,
+                    ],
+                  ),
+                ),
+              ],
+            ),
+            actions: [
+              Padding(
+                padding: const EdgeInsets.only(right: 2),
+                child: AspectRatio(
+                  aspectRatio: 1,
+                  child: AppBarIconButton(
+                    icon: SvgPicture.asset(
+                      Assets.svg.verticalEllipsis,
+                      color: Theme.of(context)
+                          .extension<StackColors>()!
+                          .topNavIconPrimary,
                     ),
-                    const SizedBox(
+                    onPressed: () {
-                      width: 10,
+                      // todo: context menu
-                    ),
+                      Navigator.of(context).pushNamed(
-                    Flexible(
+                        TokenContractDetailsView.routeName,
-                      child: Text(
+                        arguments: Tuple2(
-                        ref.watch(tokenServiceProvider
+                          ref.watch(tokenServiceProvider
-                            .select((value) => value!.tokenContract.name)),
+                              .select((value) => value!.tokenContract.address)),
-                        style: STextStyles.navBarTitle(context),
+                          widget.walletId,
-                        overflow: TextOverflow.ellipsis,
+                        ),
-                        textAlign: TextAlign.center,
+                      );
-                      ),
+                    },
-                    ),
+                  ),
-                  ],
                 ),
               ),
             ],
           ),
-          actions: [
+          body: Container(
-            Padding(
+            color: Theme.of(context).extension<StackColors>()!.background,
-              padding: const EdgeInsets.only(right: 2),
+            child: Column(
-              child: AspectRatio(
+              children: [
-                aspectRatio: 1,
+                const SizedBox(
-                child: AppBarIconButton(
+                  height: 10,
-                  icon: SvgPicture.asset(
-                    Assets.svg.verticalEllipsis,
-                    color: Theme.of(context)
-                        .extension<StackColors>()!
-                        .topNavIconPrimary,
-                  ),
-                  onPressed: () {
-                    // todo: context menu
-                    Navigator.of(context).pushNamed(
-                      TokenContractDetailsView.routeName,
-                      arguments: Tuple2(
-                        ref.watch(tokenServiceProvider
-                            .select((value) => value!.tokenContract.address)),
-                        widget.walletId,
-                      ),
-                    );
-                  },
                 ),
-              ),
+                Padding(
-            ),
-          ],
-        ),
-        body: Container(
-          color: Theme.of(context).extension<StackColors>()!.background,
-          child: Column(
-            children: [
-              const SizedBox(
-                height: 10,
-              ),
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 16),
-                child: TokenSummary(
-                  walletId: widget.walletId,
-                  initialSyncStatus: initialSyncStatus,
-                ),
-              ),
-              const SizedBox(
-                height: 20,
-              ),
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 16),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Text(
-                      "Transactions",
-                      style: STextStyles.itemSubtitle(context).copyWith(
-                        color: Theme.of(context)
-                            .extension<StackColors>()!
-                            .textDark3,
-                      ),
-                    ),
-                    CustomTextButton(
-                      text: "See all",
-                      onTap: () {
-                        Navigator.of(context).pushNamed(
-                          AllTransactionsView.routeName,
-                          arguments: widget.walletId,
-                        );
-                      },
-                    ),
-                  ],
-                ),
-              ),
-              const SizedBox(
-                height: 12,
-              ),
-              Expanded(
-                child: Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 16),
-                  child: ClipRRect(
+                  child: TokenSummary(
-                    borderRadius: BorderRadius.vertical(
+                    walletId: widget.walletId,
-                      top: Radius.circular(
+                    initialSyncStatus: initialSyncStatus,
-                        Constants.size.circularBorderRadius,
+                  ),
+                ),
+                const SizedBox(
+                  height: 20,
+                ),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 16),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Text(
+                        "Transactions",
+                        style: STextStyles.itemSubtitle(context).copyWith(
+                          color: Theme.of(context)
+                              .extension<StackColors>()!
+                              .textDark3,
+                        ),
                       ),
-                      bottom: Radius.circular(
+                      CustomTextButton(
-                        // TokenView.navBarHeight / 2.0,
+                        text: "See all",
-                        Constants.size.circularBorderRadius,
+                        onTap: () {
+                          Navigator.of(context).pushNamed(
+                            AllTransactionsView.routeName,
+                            arguments: widget.walletId,
+                          );
+                        },
                       ),
-                    ),
+                    ],
-                    child: Container(
+                  ),
-                      decoration: BoxDecoration(
+                ),
-                        color: Colors.transparent,
+                const SizedBox(
-                        borderRadius: BorderRadius.circular(
+                  height: 12,
+                ),
+                Expanded(
+                  child: Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 16),
+                    child: ClipRRect(
+                      borderRadius: BorderRadius.vertical(
+                        top: Radius.circular(
+                          Constants.size.circularBorderRadius,
+                        ),
+                        bottom: Radius.circular(
+                          // TokenView.navBarHeight / 2.0,
                           Constants.size.circularBorderRadius,
                         ),
                       ),
-                      child: Column(
+                      child: Container(
-                        crossAxisAlignment: CrossAxisAlignment.stretch,
+                        decoration: BoxDecoration(
-                        children: [
+                          color: Colors.transparent,
-                          Expanded(
+                          borderRadius: BorderRadius.circular(
-                            child: TokenTransactionsList(
+                            Constants.size.circularBorderRadius,
-                              walletId: widget.walletId,
-                            ),
                           ),
-                        ],
+                        ),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.stretch,
+                          children: [
+                            Expanded(
+                              child: TokenTransactionsList(
+                                walletId: widget.walletId,
+                              ),
+                            ),
+                          ],
+                        ),
                       ),
                     ),
                   ),
                 ),
-              ),
+              ],
-            ],
+            ),
           ),
         ),
       ),

lib/route_generator.dart

@@ -2037,6 +2037,17 @@ class RouteGenerator {
               name: settings.name,
             ),
           );
+        } else if (args is ({String walletId, bool popPrevious})) {
+          return getRoute(
+            shouldUseMaterialRoute: useMaterialPageRoute,
+            builder: (_) => TokenView(
+              walletId: args.walletId,
+              popPrevious: args.popPrevious,
+            ),
+            settings: RouteSettings(
+              name: settings.name,
+            ),
+          );
         }
         return _routeError("${settings.name} invalid args: ${args.toString()}");
 

lib/widgets/master_wallet_card.dart

@@ -16,6 +16,7 @@ import 'package:stackwallet/services/coins/ethereum/ethereum_wallet.dart';
 import 'package:stackwallet/themes/stack_colors.dart';
 import 'package:stackwallet/utilities/assets.dart';
 import 'package:stackwallet/utilities/constants.dart';
+import 'package:stackwallet/utilities/util.dart';
 import 'package:stackwallet/widgets/animated_widgets/rotate_icon.dart';
 import 'package:stackwallet/widgets/expandable.dart';
 import 'package:stackwallet/widgets/rounded_white_container.dart';
@@ -141,7 +142,7 @@ class _MasterWalletCardState extends ConsumerState<MasterWalletCard> {
                 child: SimpleWalletCard(
                   walletId: widget.walletId,
                   contractAddress: e,
-                  popPrevious: true,
+                  popPrevious: Util.isDesktop,
                 ),
               ),
             ),

lib/widgets/wallet_card.dart

@@ -157,7 +157,7 @@ class SimpleWalletCard extends ConsumerWidget {
         } else {
           await nav.pushNamed(
             TokenView.routeName,
-            arguments: walletId,
+            arguments: (walletId: walletId, popPrevious: !Util.isDesktop),
           );
         }
       }

macos/Runner/Release.entitlements

@@ -4,8 +4,8 @@
 <dict>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
-	<key>com.apple.security.network.client</key>
+ 	<key>com.apple.security.network.client</key>
-    <true/>
+	<true/>
 	<key>com.apple.security.network.server</key>
 	<true/>
 </dict>