Merge branch 'master' into release

src/components/Sidebar.tsx

@@ -158,9 +158,7 @@ export default function Sidebar(props: Props) {
                         {usage ? (
                             constants.USAGE_INFO(
                                 usage,
-                                Math.ceil(
-                                    Number(convertBytesToGBs(subscription?.storage))
-                                )
+                                Number(convertBytesToGBs(subscription?.storage))
                             )
                         ) : (
                             <div style={{ textAlign: 'center' }}>
@@ -182,11 +180,17 @@ export default function Sidebar(props: Props) {
                         background: '#242424',
                         width: '100%',
                     }}
-                ></div>
-                <LinkButton style={{ marginTop: '30px' }} onClick={openFeedbackURL}>
+                />
+                <LinkButton
+                    style={{ marginTop: '30px' }}
+                    onClick={openFeedbackURL}
+                >
                     {constants.REQUEST_FEATURE}
                 </LinkButton>
-                <LinkButton style={{ marginTop: '30px' }} onClick={openSupportMail}>
+                <LinkButton
+                    style={{ marginTop: '30px' }}
+                    onClick={openSupportMail}
+                >
                     {constants.SUPPORT}
                 </LinkButton>
                 <>
@@ -226,7 +230,7 @@ export default function Sidebar(props: Props) {
                         background: '#242424',
                         width: '100%',
                     }}
-                ></div>
+                />
                 <LinkButton
                     variant="danger"
                     style={{ marginTop: '30px' }}
@@ -246,6 +250,12 @@ export default function Sidebar(props: Props) {
                 >
                     logout
                 </LinkButton>
+                <div
+                    style={{
+                        marginTop: '40px',
+                        width: '100%',
+                    }}
+                />
             </div>
         </Menu>
     );

src/pages/gallery/components/Upload.tsx

@@ -169,7 +169,6 @@ export default function Upload(props: Props) {
             await uploadFiles(filesWithCollectionToUpload);
         } catch (e) {
             console.error('Failed to upload files to new collections', e);
-            setProgressView(false);
         }
     };
 
@@ -192,6 +191,7 @@ export default function Upload(props: Props) {
             props.setBannerMessage(err.message);
             throw err;
         } finally {
+            setProgressView(false);
             props.syncWithRemote();
         }
     };

src/utils/strings/englishConstants.tsx

@@ -90,7 +90,7 @@ const englishConstants = {
     SUBSCRIPTION_EXPIRED: 'your subscription has expired, please renew it',
 
     STORAGE_QUOTA_EXCEEDED:
-        'you have exceeded your storage quota, please upgrade your plan from the mobile app',
+        'you have exceeded your storage quota, please upgrade your plan',
     INITIAL_LOAD_DELAY_WARNING: 'the first load may take some time',
     USER_DOES_NOT_EXIST: 'sorry, could not find a user with that email',
     UPLOAD_BUTTON_TEXT: 'upload',