about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--__tests__/state/models/navigation.test.ts5
-rw-r--r--__tests__/view/com/login/CreateAccount.test.tsx2
-rw-r--r--__tests__/view/com/login/Signin.test.tsx2
-rw-r--r--__tests__/view/shell/mobile/Menu.test.tsx5
-rw-r--r--__tests__/view/shell/mobile/TabsSelector.test.tsx2
-rw-r--r--jest/jestSetup.js2
-rw-r--r--src/lib/strings.ts4
-rw-r--r--src/state/lib/api.ts4
-rw-r--r--src/state/models/feed-view.ts2
-rw-r--r--src/state/models/notifications-view.ts2
-rw-r--r--src/state/models/onboard.ts4
-rw-r--r--src/view/com/login/CreateAccount.tsx8
-rw-r--r--src/view/com/login/Signin.tsx8
-rw-r--r--src/view/com/util/LoadingPlaceholder.tsx2
-rw-r--r--src/view/com/util/UserInfoText.tsx8
-rw-r--r--src/view/com/util/ViewHeader.tsx2
-rw-r--r--src/view/com/util/gestures/SwipeAndZoom.tsx20
-rw-r--r--src/view/com/util/text/RichText.tsx7
-rw-r--r--src/view/screens/Contacts.tsx2
-rw-r--r--src/view/screens/Profile.tsx4
-rw-r--r--src/view/screens/Search.tsx2
22 files changed, 62 insertions, 38 deletions
diff --git a/.gitignore b/.gitignore
index 5f5961903..cd2e89f83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,4 +61,5 @@ buck-out/
 /vendor/bundle/
 
 # Testing
-coverage/
\ No newline at end of file
+coverage/
+junit.xml
\ No newline at end of file
diff --git a/__tests__/state/models/navigation.test.ts b/__tests__/state/models/navigation.test.ts
index bc49d2ee3..284f1f36e 100644
--- a/__tests__/state/models/navigation.test.ts
+++ b/__tests__/state/models/navigation.test.ts
@@ -1,7 +1,4 @@
-import {
-  NavigationModel,
-  NavigationTabModel,
-} from './../../../src/state/models/navigation'
+import {NavigationModel} from './../../../src/state/models/navigation'
 import * as flags from '../../../src/build-flags'
 
 describe('NavigationModel', () => {
diff --git a/__tests__/view/com/login/CreateAccount.test.tsx b/__tests__/view/com/login/CreateAccount.test.tsx
index 2de99b2a3..0c13db6a2 100644
--- a/__tests__/view/com/login/CreateAccount.test.tsx
+++ b/__tests__/view/com/login/CreateAccount.test.tsx
@@ -3,8 +3,6 @@ import {Keyboard} from 'react-native'
 import {CreateAccount} from '../../../../src/view/com/login/CreateAccount'
 import {cleanup, fireEvent, render} from '../../../../jest/test-utils'
 import {
-  mockedLogStore,
-  mockedRootStore,
   mockedSessionStore,
   mockedShellStore,
 } from '../../../../__mocks__/state-mock'
diff --git a/__tests__/view/com/login/Signin.test.tsx b/__tests__/view/com/login/Signin.test.tsx
index 51b411836..e5b6bdbc6 100644
--- a/__tests__/view/com/login/Signin.test.tsx
+++ b/__tests__/view/com/login/Signin.test.tsx
@@ -3,8 +3,6 @@ import {Signin} from '../../../../src/view/com/login/Signin'
 import {cleanup, fireEvent, render} from '../../../../jest/test-utils'
 import {SessionServiceClient, sessionClient as AtpApi} from '@atproto/api'
 import {
-  mockedLogStore,
-  mockedRootStore,
   mockedSessionStore,
   mockedShellStore,
 } from '../../../../__mocks__/state-mock'
diff --git a/__tests__/view/shell/mobile/Menu.test.tsx b/__tests__/view/shell/mobile/Menu.test.tsx
index caec5f29a..0bffaff7f 100644
--- a/__tests__/view/shell/mobile/Menu.test.tsx
+++ b/__tests__/view/shell/mobile/Menu.test.tsx
@@ -1,10 +1,7 @@
 import React from 'react'
 import {Menu} from '../../../../src/view/shell/mobile/Menu'
 import {cleanup, fireEvent, render} from '../../../../jest/test-utils'
-import {
-  mockedNavigationStore,
-  mockedShellStore,
-} from '../../../../__mocks__/state-mock'
+import {mockedNavigationStore} from '../../../../__mocks__/state-mock'
 
 describe('Menu', () => {
   const onCloseMock = jest.fn()
diff --git a/__tests__/view/shell/mobile/TabsSelector.test.tsx b/__tests__/view/shell/mobile/TabsSelector.test.tsx
index cd5c6d2f2..be6bc967a 100644
--- a/__tests__/view/shell/mobile/TabsSelector.test.tsx
+++ b/__tests__/view/shell/mobile/TabsSelector.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import {Animated, Share} from 'react-native'
+import {Animated} from 'react-native'
 import {TabsSelector} from '../../../../src/view/shell/mobile/TabsSelector'
 import {cleanup, fireEvent, render} from '../../../../jest/test-utils'
 import {mockedNavigationStore} from '../../../../__mocks__/state-mock'
diff --git a/jest/jestSetup.js b/jest/jestSetup.js
index 1cad50c7a..b1f110a53 100644
--- a/jest/jestSetup.js
+++ b/jest/jestSetup.js
@@ -1,3 +1,5 @@
+/* global jest */
+
 import 'react-native-gesture-handler/jestSetup'
 jest.mock('@react-native-async-storage/async-storage', () =>
   require('@react-native-async-storage/async-storage/jest/async-storage-mock'),
diff --git a/src/lib/strings.ts b/src/lib/strings.ts
index 77fe222e4..24b8bcafa 100644
--- a/src/lib/strings.ts
+++ b/src/lib/strings.ts
@@ -199,7 +199,9 @@ export function enforceLen(str: string, len: number): string {
 }
 
 export function cleanError(str: any): string {
-  if (!str) return str
+  if (!str) {
+    return str
+  }
   if (typeof str !== 'string') {
     str = str.toString()
   }
diff --git a/src/state/lib/api.ts b/src/state/lib/api.ts
index 1dfbf5090..2738ba209 100644
--- a/src/state/lib/api.ts
+++ b/src/state/lib/api.ts
@@ -84,7 +84,7 @@ export async function post(
   if (!embed && extLink) {
     let thumb
     if (extLink.localThumb) {
-      onStateChange?.(`Uploading link thumbnail...`)
+      onStateChange?.('Uploading link thumbnail...')
       let encoding
       if (extLink.localThumb.path.endsWith('.png')) {
         encoding = 'image/png'
@@ -140,7 +140,7 @@ export async function post(
   }
 
   try {
-    onStateChange?.(`Posting...`)
+    onStateChange?.('Posting...')
     return await store.api.app.bsky.feed.post.create(
       {did: store.me.did || ''},
       {
diff --git a/src/state/models/feed-view.ts b/src/state/models/feed-view.ts
index a1647518b..a7e3c6155 100644
--- a/src/state/models/feed-view.ts
+++ b/src/state/models/feed-view.ts
@@ -426,7 +426,7 @@ export class FeedModel {
     }
     this._xLoading()
     let numToFetch = this.feed.length
-    let cursor = undefined
+    let cursor
     try {
       do {
         const res: GetTimeline.Response = await this._getFeed({
diff --git a/src/state/models/notifications-view.ts b/src/state/models/notifications-view.ts
index 965efb87d..32294ef33 100644
--- a/src/state/models/notifications-view.ts
+++ b/src/state/models/notifications-view.ts
@@ -366,7 +366,7 @@ export class NotificationsViewModel {
     }
     this._xLoading()
     let numToFetch = this.notifications.length
-    let cursor = undefined
+    let cursor
     try {
       do {
         const res: ListNotifications.Response =
diff --git a/src/state/models/onboard.ts b/src/state/models/onboard.ts
index 1af0223ab..5ab5ecb62 100644
--- a/src/state/models/onboard.ts
+++ b/src/state/models/onboard.ts
@@ -50,7 +50,9 @@ export class OnboardModel {
   }
 
   next() {
-    if (!this.isOnboarding) return
+    if (!this.isOnboarding) {
+      return
+    }
     let i = OnboardStageOrder.indexOf(this.stage)
     i++
     if (i >= OnboardStageOrder.length) {
diff --git a/src/view/com/login/CreateAccount.tsx b/src/view/com/login/CreateAccount.tsx
index 279a55f52..349c48ef7 100644
--- a/src/view/com/login/CreateAccount.tsx
+++ b/src/view/com/login/CreateAccount.tsx
@@ -48,12 +48,16 @@ export const CreateAccount = ({onPressBack}: {onPressBack: () => void}) => {
     setServiceDescription(undefined)
     store.session.describeService(serviceUrl).then(
       desc => {
-        if (aborted) return
+        if (aborted) {
+          return
+        }
         setServiceDescription(desc)
         setUserDomain(desc.availableUserDomains[0])
       },
       err => {
-        if (aborted) return
+        if (aborted) {
+          return
+        }
         store.log.warn(
           `Failed to fetch service description for ${serviceUrl}`,
           err,
diff --git a/src/view/com/login/Signin.tsx b/src/view/com/login/Signin.tsx
index f60b637b7..e99aaa651 100644
--- a/src/view/com/login/Signin.tsx
+++ b/src/view/com/login/Signin.tsx
@@ -47,11 +47,15 @@ export const Signin = ({onPressBack}: {onPressBack: () => void}) => {
     setError('')
     store.session.describeService(serviceUrl).then(
       desc => {
-        if (aborted) return
+        if (aborted) {
+          return
+        }
         setServiceDescription(desc)
       },
       err => {
-        if (aborted) return
+        if (aborted) {
+          return
+        }
         store.log.warn(
           `Failed to fetch service description for ${serviceUrl}`,
           err,
diff --git a/src/view/com/util/LoadingPlaceholder.tsx b/src/view/com/util/LoadingPlaceholder.tsx
index b51191bd9..207a3f5d2 100644
--- a/src/view/com/util/LoadingPlaceholder.tsx
+++ b/src/view/com/util/LoadingPlaceholder.tsx
@@ -76,7 +76,7 @@ export function PostLoadingPlaceholder({
               strokeWidth={1.7}
             />
           </View>
-          <View style={s.flex1}></View>
+          <View style={s.flex1} />
         </View>
       </View>
     </View>
diff --git a/src/view/com/util/UserInfoText.tsx b/src/view/com/util/UserInfoText.tsx
index db6696a9b..5cdfd1345 100644
--- a/src/view/com/util/UserInfoText.tsx
+++ b/src/view/com/util/UserInfoText.tsx
@@ -40,11 +40,15 @@ export function UserInfoText({
     let aborted = false
     store.profiles.getProfile(did).then(
       v => {
-        if (aborted) return
+        if (aborted) {
+          return
+        }
         setProfile(v.data)
       },
       _err => {
-        if (aborted) return
+        if (aborted) {
+          return
+        }
         setFailed(true)
       },
     )
diff --git a/src/view/com/util/ViewHeader.tsx b/src/view/com/util/ViewHeader.tsx
index 230273709..d1e9b397b 100644
--- a/src/view/com/util/ViewHeader.tsx
+++ b/src/view/com/util/ViewHeader.tsx
@@ -36,7 +36,7 @@ export const ViewHeader = observer(function ViewHeader({
     store.shell.setMainMenuOpen(true)
   }
   const onPressSearch = () => {
-    store.nav.navigate(`/search`)
+    store.nav.navigate('/search')
   }
   const onPressReconnect = () => {
     store.session.connect().catch(e => {
diff --git a/src/view/com/util/gestures/SwipeAndZoom.tsx b/src/view/com/util/gestures/SwipeAndZoom.tsx
index dc3a9f54c..881eea094 100644
--- a/src/view/com/util/gestures/SwipeAndZoom.tsx
+++ b/src/view/com/util/gestures/SwipeAndZoom.tsx
@@ -88,11 +88,21 @@ export function SwipeAndZoom({
   }
 
   const canDir = (d: Dir) => {
-    if (d === Dir.Left) return canSwipeLeft
-    if (d === Dir.Right) return canSwipeRight
-    if (d === Dir.Up) return canSwipeUp
-    if (d === Dir.Down) return canSwipeDown
-    if (d === Dir.Zoom) return zoomEnabled
+    if (d === Dir.Left) {
+      return canSwipeLeft
+    }
+    if (d === Dir.Right) {
+      return canSwipeRight
+    }
+    if (d === Dir.Up) {
+      return canSwipeUp
+    }
+    if (d === Dir.Down) {
+      return canSwipeDown
+    }
+    if (d === Dir.Zoom) {
+      return zoomEnabled
+    }
     return false
   }
   const isHorz = (d: Dir) => d === Dir.Left || d === Dir.Right
diff --git a/src/view/com/util/text/RichText.tsx b/src/view/com/util/text/RichText.tsx
index a7bc92a45..f04f4566d 100644
--- a/src/view/com/util/text/RichText.tsx
+++ b/src/view/com/util/text/RichText.tsx
@@ -46,8 +46,11 @@ export function RichText({
       </Text>
     )
   }
-  if (!style) style = []
-  else if (!Array.isArray(style)) style = [style]
+  if (!style) {
+    style = []
+  } else if (!Array.isArray(style)) {
+    style = [style]
+  }
   entities.sort(sortByIndex)
   const segments = Array.from(toSegments(text, entities))
   const els = []
diff --git a/src/view/screens/Contacts.tsx b/src/view/screens/Contacts.tsx
index b22e52fe5..600cd78c6 100644
--- a/src/view/screens/Contacts.tsx
+++ b/src/view/screens/Contacts.tsx
@@ -15,7 +15,7 @@ export const Contacts = ({navIdx, visible, params}: ScreenParams) => {
 
   useEffect(() => {
     if (visible) {
-      store.nav.setTitle(navIdx, `Contacts`)
+      store.nav.setTitle(navIdx, 'Contacts')
     }
   }, [store, visible])
 
diff --git a/src/view/screens/Profile.tsx b/src/view/screens/Profile.tsx
index d701fba0d..bd60ca61c 100644
--- a/src/view/screens/Profile.tsx
+++ b/src/view/screens/Profile.tsx
@@ -40,7 +40,9 @@ export const Profile = observer(({navIdx, visible, params}: ScreenParams) => {
     } else {
       store.nav.setTitle(navIdx, params.name)
       uiState.setup().then(() => {
-        if (aborted) return
+        if (aborted) {
+          return
+        }
         setHasSetup(true)
       })
     }
diff --git a/src/view/screens/Search.tsx b/src/view/screens/Search.tsx
index 82586e829..385489c4b 100644
--- a/src/view/screens/Search.tsx
+++ b/src/view/screens/Search.tsx
@@ -33,7 +33,7 @@ export const Search = ({navIdx, visible, params}: ScreenParams) => {
     if (visible) {
       store.shell.setMinimalShellMode(false)
       autocompleteView.setup()
-      store.nav.setTitle(navIdx, `Search`)
+      store.nav.setTitle(navIdx, 'Search')
     }
   }, [store, visible, name])