Improve state handling for bottom box

Author: eqrion

src/app-logic/url-handling.ts

@@ -363,9 +363,9 @@ export function getQueryStringFromUrlState(urlState: UrlState): string {
             assemblyView.nativeSymbol
           );
         }
-      }
-      if (isBottomBoxFullscreen) {
-        query.bottomFullscreen = true;
+        if (isBottomBoxFullscreen) {
+          query.bottomFullscreen = true;
+        }
       }
       break;
     }

src/components/app/BottomBox.tsx

@@ -168,10 +168,14 @@ class BottomBoxImpl extends React.PureComponent<Props> {
     if (event.key === 'Escape' && this.props.isFullscreen) {
       this.props.toggleBottomBoxFullscreen();
     }
-  }
+  };
 
   _onClickCloseButton = () => {
     this.props.closeBottomBox();
+    // Close the fullscreen if we're closing the bottom box
+    if (this.props.isFullscreen) {
+      this.props.toggleBottomBoxFullscreen();
+    }
   };
 
   override render() {