Merge branch 'staging' into submodule-macos-shasum

Author: danrmiller

lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/more_features/more_features_dialog.dart

@@ -336,7 +336,7 @@ class _MoreFeaturesDialogState extends ConsumerState<MoreFeaturesDialog> {
     return DesktopDialog(
       maxHeight: maxDialogHeight,
       child: Column(
-        mainAxisSize: MainAxisSize.max,
+        mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
           Row(
@@ -353,7 +353,7 @@ class _MoreFeaturesDialogState extends ConsumerState<MoreFeaturesDialog> {
             ],
           ),
 
-          Expanded(
+          Flexible(
             child: SingleChildScrollView(
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.stretch,