From e9f186065da1c9716cea8849c345654870ca2642 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 14 Dec 2020 16:23:59 +1100
Subject: [PATCH] do not shrink SessionSpinner

---
 stylesheets/_session.scss                     |  1 +
 .../session/SessionClosableOverlay.tsx        |  4 +-
 ts/components/session/SessionSpinner.tsx      | 44 +++++++------------
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 26f6e44ef..28b48322d 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -801,6 +801,7 @@ label {
   position: relative;
   width: 80px;
   height: 80px;
+  flex-shrink: 0;
 
   div {
     position: absolute;
diff --git a/ts/components/session/SessionClosableOverlay.tsx b/ts/components/session/SessionClosableOverlay.tsx
index 5b3ef484c..bd6ce2665 100644
--- a/ts/components/session/SessionClosableOverlay.tsx
+++ b/ts/components/session/SessionClosableOverlay.tsx
@@ -168,6 +168,8 @@ export class SessionClosableOverlay extends React.Component<Props, State> {
       overlayMode === SessionClosableOverlayType.ClosedGroup &&
       contacts.length === 0;
 
+    const showLoadingSpinner = showSpinner === undefined ? false : showSpinner;
+
     return (
       <div className="module-left-pane-overlay">
         <div className="exit">
@@ -211,7 +213,7 @@ export class SessionClosableOverlay extends React.Component<Props, State> {
           />
         )}
 
-        {showSpinner && <SessionSpinner />}
+        <SessionSpinner loading={showLoadingSpinner} />
 
         {isClosedGroupView && (
           <>
diff --git a/ts/components/session/SessionSpinner.tsx b/ts/components/session/SessionSpinner.tsx
index dd33e0688..b57bb0110 100644
--- a/ts/components/session/SessionSpinner.tsx
+++ b/ts/components/session/SessionSpinner.tsx
@@ -1,32 +1,22 @@
 import React from 'react';
 
-interface Props {
+type Props = {
   loading: boolean;
-}
+};
 
-export class SessionSpinner extends React.Component<Props> {
-  public static defaultProps = {
-    loading: true,
-  };
+export const SessionSpinner = (props: Props) => {
+  const { loading } = props;
 
-  constructor(props: any) {
-    super(props);
-  }
-
-  public render() {
-    const { loading } = this.props;
-
-    return (
-      <>
-        {loading ? (
-          <div className="session-loader">
-            <div />
-            <div />
-            <div />
-            <div />
-          </div>
-        ) : null}
-      </>
-    );
-  }
-}
+  return (
+    <>
+      {loading ? (
+        <div className="session-loader">
+          <div />
+          <div />
+          <div />
+          <div />
+        </div>
+      ) : null}
+    </>
+  );
+};