chore: Follow up pop space view

lib/pages/chat_list/chat_list_view.dart

@@ -30,9 +30,14 @@ class ChatListView extends StatelessWidget {
         final selectMode = controller.selectMode;
         return PopScope(
           canPop: controller.selectMode == SelectMode.normal &&
-              !controller.isSearchMode,
+              !controller.isSearchMode &&
+              controller.activeSpaceId == null,
           onPopInvoked: (pop) {
             if (pop) return;
+            if (controller.activeSpaceId != null) {
+              controller.clearActiveSpace();
+              return;
+            }
             final selMode = controller.selectMode;
             if (controller.isSearchMode) {
               controller.cancelSearch();

lib/pages/chat_list/space_view.dart

@@ -165,10 +165,7 @@ class _SpaceViewState extends State<SpaceView> {
     final room = Matrix.of(context).client.getRoomById(widget.spaceId);
     final displayname =
         room?.getLocalizedDisplayname() ?? L10n.of(context)!.nothingFound;
-    return PopScope(
+    return Scaffold(
-      canPop: false,
-      onPopInvoked: (_) => widget.onBack(),
-      child: Scaffold(
       appBar: AppBar(
         leading: Center(
           child: CloseButton(
@@ -283,9 +280,8 @@ class _SpaceViewState extends State<SpaceView> {
                         onChanged: (_) => setState(() {}),
                         textInputAction: TextInputAction.search,
                         decoration: InputDecoration(
-                            fillColor: Theme.of(context)
+                          fillColor:
-                                .colorScheme
+                              Theme.of(context).colorScheme.secondaryContainer,
-                                .secondaryContainer,
                           border: OutlineInputBorder(
                             borderSide: BorderSide.none,
                             borderRadius: BorderRadius.circular(99),
@@ -473,7 +469,6 @@ class _SpaceViewState extends State<SpaceView> {
                 );
               },
             ),
-      ),
     );
   }
 }