fix: duplicate files quota calls in preferences (#1006)

standardnotes · Apr 27, 2022 · e7fb9b6 · e7fb9b6
1 parent d33e48e
commit e7fb9b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/app/assets/javascripts/Components/Preferences/Panes/Account/Files.tsx b/app/assets/javascripts/Components/Preferences/Panes/Account/Files.tsx
@@ -1,22 +1,15 @@
 import { WebApplication } from '@/UIModels/Application'
-import { AppState } from '@/UIModels/AppState'
 import { formatSizeToReadableString } from '@standardnotes/filepicker'
 import { SubscriptionSettingName } from '@standardnotes/snjs'
-import { observer } from 'mobx-react-lite'
 import { FunctionComponent } from 'preact'
 import { useEffect, useState } from 'preact/hooks'
 import { PreferencesGroup, PreferencesSegment, Subtitle, Title } from '../../PreferencesComponents'
 
 type Props = {
   application: WebApplication
-  appState: AppState
 }
 
-export const FilesSection: FunctionComponent<Props> = observer(({ application, appState }) => {
-  if (!application.getUser() || !appState.features.isEntitledToFiles) {
-    return null
-  }
-
+export const FilesSection: FunctionComponent<Props> = ({ application }) => {
   const [isLoading, setIsLoading] = useState(true)
   const [filesQuotaUsed, setFilesQuotaUsed] = useState<number>(0)
   const [filesQuotaTotal, setFilesQuotaTotal] = useState<number>(0)
@@ -41,7 +34,7 @@ export const FilesSection: FunctionComponent<Props> = observer(({ application, a
     }
 
     getFilesQuota().catch(console.error)
-  })
+  }, [application.settings])
 
   return (
     <PreferencesGroup>
@@ -69,4 +62,4 @@ export const FilesSection: FunctionComponent<Props> = observer(({ application, a
       </PreferencesSegment>
     </PreferencesGroup>
   )
-})
+}
diff --git a/app/assets/javascripts/Components/Preferences/Panes/Account/index.tsx b/app/assets/javascripts/Components/Preferences/Panes/Account/index.tsx
@@ -25,7 +25,9 @@ export const AccountPreferences = observer(({ application, appState }: Props) =>
       </>
     )}
     <Subscription application={application} appState={appState} />
-    <FilesSection application={application} appState={appState} />
+    {application.hasAccount() && appState.features.isEntitledToFiles && (
+      <FilesSection application={application} />
+    )}
     <SignOutWrapper application={application} appState={appState} />
   </PreferencesPane>
 ))