Merge pull request #3119 from mariojsnunes/refactor/remaining-compone…

…nts-hooks refactor: remaining class components to hooks
ONEARMY · Dec 29, 2023 · 85479f0 · 85479f0
2 parents 487ec36 + a87bc85
commit 85479f0
Show file tree

Hide file tree

Showing 9 changed files with 588 additions and 688 deletions.
diff --git a/packages/components/src/ModerationStatus/ModerationStatus.tsx b/packages/components/src/ModerationStatus/ModerationStatus.tsx
@@ -3,7 +3,7 @@ import { Text } from 'theme-ui'
 
 export interface Props {
   status: string
-  contentType: 'event' | 'howto' | 'research'
+  contentType: 'event' | 'howto' | 'research' | 'question'
   sx?: ThemeUIStyleObject
 }
 

diff --git a/src/App.tsx b/src/App.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react'
+import React from 'react'
 import { observer, Provider } from 'mobx-react'
 import { ThemeProvider, Global } from '@emotion/react'
 import { GlobalStyles } from 'oa-components'
@@ -18,24 +18,17 @@ export const useCommonStores = () =>
 export const dbContext = React.createContext({ db: rootStore.dbV2 })
 export const useDB = () => React.useContext(dbContext)
 
-@observer
-export class App extends Component {
-  render() {
-    return (
-      <>
-        <Provider {...rootStore.stores}>
-          <ThemeProvider
-            theme={rootStore.stores.themeStore.currentTheme.styles}
-          >
-            <>
-              <ErrorBoundary>
-                <Pages />
-              </ErrorBoundary>
-              <Global styles={GlobalStyles} />
-            </>
-          </ThemeProvider>
-        </Provider>
-      </>
-    )
-  }
-}
+export const App = observer(() => {
+  return (
+    <Provider {...rootStore.stores}>
+      <ThemeProvider theme={rootStore.stores.themeStore.currentTheme.styles}>
+        <>
+          <ErrorBoundary>
+            <Pages />
+          </ErrorBoundary>
+          <Global styles={GlobalStyles} />
+        </>
+      </ThemeProvider>
+    </Provider>
+  )
+})