Merge pull request #1788 from bluesky-social/eric/app-899-remove-icons-from-startup-code

Revise icons startup code

src/App.native.tsx

@@ -1,20 +1,23 @@
 import 'react-native-url-polyfill/auto'
+import 'lib/sentry' // must be near top
+
 import React, {useState, useEffect} from 'react'
-import 'lib/sentry' // must be relatively on top
-import {withSentry} from 'lib/sentry'
 import {RootSiblingParent} from 'react-native-root-siblings'
 import * as SplashScreen from 'expo-splash-screen'
 import {GestureHandlerRootView} from 'react-native-gesture-handler'
 import {observer} from 'mobx-react-lite'
+import {QueryClientProvider} from '@tanstack/react-query'
+
+import 'view/icons'
+
+import {withSentry} from 'lib/sentry'
 import {ThemeProvider} from 'lib/ThemeContext'
 import {s} from 'lib/styles'
-import * as view from './view/index'
 import {RootStoreModel, setupState, RootStoreProvider} from './state'
-import {Shell} from './view/shell'
+import {Shell} from 'view/shell'
 import * as notifications from 'lib/notifications/notifications'
 import * as analytics from 'lib/analytics/analytics'
-import * as Toast from './view/com/util/Toast'
+import * as Toast from 'view/com/util/Toast'
-import {QueryClientProvider} from '@tanstack/react-query'
 import {queryClient} from 'lib/react-query'
 import {TestCtrls} from 'view/com/testing/TestCtrls'
 
@@ -27,7 +30,6 @@ const App = observer(function AppImpl() {
 
   // init
   useEffect(() => {
-    view.setup()
     setupState().then(store => {
       setRootStore(store)
       analytics.init(store)

src/App.web.tsx

@@ -1,15 +1,18 @@
+import 'lib/sentry' // must be near top
+
 import React, {useState, useEffect} from 'react'
-import 'lib/sentry' // must be relatively on top
-import {SafeAreaProvider} from 'react-native-safe-area-context'
-import {RootSiblingParent} from 'react-native-root-siblings'
-import * as view from './view/index'
-import * as analytics from 'lib/analytics/analytics'
-import {RootStoreModel, setupState, RootStoreProvider} from './state'
-import {Shell} from './view/shell/index'
-import {ToastContainer} from './view/com/util/Toast.web'
-import {ThemeProvider} from 'lib/ThemeContext'
 import {observer} from 'mobx-react-lite'
 import {QueryClientProvider} from '@tanstack/react-query'
+import {SafeAreaProvider} from 'react-native-safe-area-context'
+import {RootSiblingParent} from 'react-native-root-siblings'
+
+import 'view/icons'
+
+import * as analytics from 'lib/analytics/analytics'
+import {RootStoreModel, setupState, RootStoreProvider} from './state'
+import {Shell} from 'view/shell/index'
+import {ToastContainer} from 'view/com/util/Toast.web'
+import {ThemeProvider} from 'lib/ThemeContext'
 import {queryClient} from 'lib/react-query'
 
 const App = observer(function AppImpl() {
@@ -19,7 +22,6 @@ const App = observer(function AppImpl() {
 
   // init
   useEffect(() => {
-    view.setup()
     setupState().then(store => {
       setRootStore(store)
       analytics.init(store)

src/view/icons.ts

@@ -99,8 +99,7 @@ import {faX} from '@fortawesome/free-solid-svg-icons/faX'
 import {faXmark} from '@fortawesome/free-solid-svg-icons/faXmark'
 import {faChevronDown} from '@fortawesome/free-solid-svg-icons/faChevronDown'
 
-export function setup() {
+library.add(
-  library.add(
   faAddressCard,
   faAngleDown,
   faAngleLeft,
@@ -199,5 +198,4 @@ export function setup() {
   faX,
   faXmark,
   faChevronDown,
-  )
+)
-}