Merge pull request #5753 from EdgeApp/matthew/eslint-fixes

Re-enable no-misused-promises and no-dynamic-delete eslint rules

Author: swansontec

eslint.config.mjs

@@ -541,8 +541,6 @@ export default [
     rules: {
       '@typescript-eslint/ban-ts-comment': 'warn',
       '@typescript-eslint/explicit-function-return-type': 'warn',
-      '@typescript-eslint/no-dynamic-delete': 'warn',
-      '@typescript-eslint/no-misused-promises': 'warn',
       '@typescript-eslint/strict-boolean-expressions': 'warn',
       '@typescript-eslint/use-unknown-in-catch-callback-variable': 'warn'
     }

src/actions/CountryListActions.tsx

@@ -28,22 +28,26 @@ export const checkAndSetRegion = (props: {
   countryCode: string
   stateProvinceCode?: string
 }): ThunkAction<void> => {
-  return async (dispatch, getState) => {
+  return (dispatch, getState) => {
     const { countryCode, stateProvinceCode } = props
 
     if (countryCode == null || countryCode === '') {
       // If no countryCode, always show country selection
-      await dispatch(showCountrySelectionModal(props))
+      dispatch(showCountrySelectionModal(props)).catch((error: unknown) => {
+        showError(error)
+      })
     } else {
       // Show state province selection if stateProvinceCode is required according
       // to the country data
       const countryData = COUNTRY_CODES.find(
         cc => cc['alpha-2'] === countryCode
       )
       if (countryData != null && stateProvinceCode == null) {
-        await dispatch(
+        dispatch(
           showCountrySelectionModal({ ...props, skipCountry: true })
-        )
+        ).catch((error: unknown) => {
+          showError(error)
+        })
       }
     }
   }

src/actions/LoginActions.tsx

@@ -216,11 +216,15 @@ export function initializeAccount(
           )}
         />
       ))
-        .finally(async () => {
+        .finally(() => {
           for (const pluginId of pluginIdsNeedingUserAction) {
             const currencyConfig = account.currencyConfig[pluginId]
             const { userSettings = {} } = currencyConfig
-            await currencyConfig.changeUserSettings(userSettings)
+            currencyConfig
+              .changeUserSettings(userSettings)
+              .catch((error: unknown) => {
+                showError(error)
+              })
           }
         })
         .catch(err => {

src/actions/PaymentProtoActions.tsx

@@ -405,7 +405,7 @@ export async function launchPaymentProto(
     tokenId,
     lockTilesMap: { amount: true, address: true, fee: requiredFeeRate != null },
     onBack,
-    onDone: async (error: Error | null, edgeTransaction?: EdgeTransaction) => {
+    onDone: (error: Error | null, edgeTransaction?: EdgeTransaction) => {
       if (error)
         showError(
           `${lstrings.create_wallet_account_error_sending_transaction}: ${error.message}`

src/app.ts

@@ -14,6 +14,7 @@ import { getVersion } from 'react-native-device-info'
 import RNFS from 'react-native-fs'
 
 import { initDeviceSettings } from './actions/DeviceSettingsActions'
+import { showError } from './components/services/AirshipInstance'
 import { changeTheme, getTheme } from './components/services/ThemeContext'
 import { ENV } from './env'
 import type { NumberMap } from './types/types'
@@ -101,7 +102,7 @@ const asServerDetails = asObject({
 const ENABLE_PERF_LOGGING = false
 const PERF_LOGGING_ONLY = false
 
-const perfTimers: NumberMap = {}
+const perfTimers = new Map<string, number>()
 const perfCounters: NumberMap = {}
 const perfTotals: NumberMap = {}
 
@@ -165,9 +166,9 @@ if (ENABLE_PERF_LOGGING) {
       perfTotals[label] = 0
       perfCounters[label] = 0
     }
-    if (typeof perfTimers[label] === 'undefined') {
+    if (typeof perfTimers.get(label) === 'undefined') {
       // @ts-expect-error
-      perfTimers[label] = global.nativePerformanceNow()
+      perfTimers.set(label, global.nativePerformanceNow())
     } else {
       clog(`${d}: PTIMER Error: PTimer already started: ${label}`)
     }
@@ -176,15 +177,16 @@ if (ENABLE_PERF_LOGGING) {
   // @ts-expect-error
   global.pend = function (label: string) {
     const d = makeDate()
-    if (typeof perfTimers[label] === 'number') {
+    const timer = perfTimers.get(label)
+    if (typeof timer === 'number') {
       // @ts-expect-error
-      const elapsed = global.nativePerformanceNow() - perfTimers[label]
+      const elapsed = global.nativePerformanceNow() - timer
       perfTotals[label] += elapsed
       perfCounters[label]++
       clog(
         `${d}: PTIMER ${label}:${elapsed}ms total:${perfTotals[label]}ms count:${perfCounters[label]}`
       )
-      delete perfTimers[label]
+      perfTimers.delete(label)
     } else {
       clog(`${d}: PTIMER Error: PTimer not started: ${label}`)
     }
@@ -250,7 +252,7 @@ if (ENV.DEBUG_THEME) {
         method: 'GET'
       }
       let themeJson = ''
-      setInterval(async () => {
+      const updateTheme = async (): Promise<void> => {
         try {
           const response = await realFetch(url, getOptions)
           const overrideTheme = await response.json()
@@ -264,6 +266,11 @@ if (ENV.DEBUG_THEME) {
         } catch (e: any) {
           console.log(`Failed get theme`, e.message)
         }
+      }
+      setInterval(() => {
+        updateTheme().catch((error: unknown) => {
+          showError(error)
+        })
       }, 3000)
     } catch (e: any) {
       console.log(`Failed to access theme server`)

src/components/FioAddress/ConnectWallets.tsx

@@ -134,20 +134,20 @@ export const ConnectWallets = (props: FioConnectWalletsProps) => {
   ): void => {
     if (value) {
       if (disconnectWalletsMap[item.key] != null) {
-        delete disconnectWalletsMap[item.key]
+        const { [item.key]: _, ...rest } = disconnectWalletsMap
+        setDisconnectWalletsMap(rest)
       } else {
-        connectWalletsMap[item.key] = item
+        setConnectWalletsMap({ ...connectWalletsMap, [item.key]: item })
       }
     } else {
       if (connectWalletsMap[item.key] != null) {
-        delete connectWalletsMap[item.key]
+        const { [item.key]: _, ...rest } = connectWalletsMap
+        setConnectWalletsMap(rest)
       } else {
-        disconnectWalletsMap[item.key] = item
+        setDisconnectWalletsMap({ ...disconnectWalletsMap, [item.key]: item })
       }
     }
 
-    setConnectWalletsMap({ ...connectWalletsMap })
-    setDisconnectWalletsMap({ ...disconnectWalletsMap })
     flashListToggle = !flashListToggle
   }
 

src/components/cards/EarnOptionCard.tsx

@@ -22,7 +22,7 @@ interface Props {
   /** If false, show "Stake"/"Earn"
    * If true, show "Staked"/"Earned" */
   isOpenPosition?: boolean
-  onPress?: () => void
+  onPress?: () => Promise<void>
 }
 
 export function EarnOptionCard(props: Props) {

src/components/modals/CategoryModal.tsx

@@ -20,6 +20,7 @@ import { useDispatch, useSelector } from '../../types/reactRedux'
 import { scale } from '../../util/scaling'
 import { MinimalButton } from '../buttons/MinimalButton'
 import { EdgeTouchableOpacity } from '../common/EdgeTouchableOpacity'
+import { showError } from '../services/AirshipInstance'
 import { cacheStyles, type Theme, useTheme } from '../services/ThemeContext'
 import { DividerLine } from '../themed/DividerLine'
 import { EdgeText } from '../themed/EdgeText'
@@ -117,9 +118,11 @@ export function CategoryModal(props: Props) {
     bridge.resolve(fullCategory)
   }
 
-  const handleSubmit = useHandler(async () => {
+  const handleSubmit = useHandler(() => {
     const fullCategory = joinCategory({ category, subcategory })
-    await handleCategoryUpdate(fullCategory)
+    handleCategoryUpdate(fullCategory).catch((error: unknown) => {
+      showError(error)
+    })
   })
 
   const keyExtractor = useHandler((row: CategoryRow) => row.raw)

src/components/modals/PasswordReminderModal.tsx

@@ -64,28 +64,32 @@ export class PasswordReminderModalComponent extends React.PureComponent<
     }
   }
 
-  handleSubmit = async () => {
+  handleSubmit = (): void => {
     const { bridge, account } = this.props
     const { password } = this.state
 
-    const isValidPassword = await account.checkPassword(password).catch(err => {
-      showError(err)
-    })
-    if (isValidPassword) {
-      this.props.dispatch({
-        type: 'PASSWORD_REMINDER_MODAL/CHECK_PASSWORD_SUCCESS'
+    account
+      .checkPassword(password)
+      .then(isValidPassword => {
+        if (isValidPassword) {
+          this.props.dispatch({
+            type: 'PASSWORD_REMINDER_MODAL/CHECK_PASSWORD_SUCCESS'
+          })
+          this.setState({ checkingPassword: false })
+          showToast(lstrings.password_reminder_great_job)
+          setTimeout(() => {
+            bridge.resolve()
+          }, 10)
+        } else {
+          this.setState({
+            errorMessage: lstrings.password_reminder_invalid,
+            checkingPassword: false
+          })
+        }
       })
-      this.setState({ checkingPassword: false })
-      showToast(lstrings.password_reminder_great_job)
-      setTimeout(() => {
-        bridge.resolve()
-      }, 10)
-    } else {
-      this.setState({
-        errorMessage: lstrings.password_reminder_invalid,
-        checkingPassword: false
+      .catch(err => {
+        showError(err)
       })
-    }
   }
 
   handleChangeText = (password: string) => {

src/components/modals/SwapVerifyTermsModal.tsx

@@ -6,7 +6,7 @@ import FastImage from 'react-native-fast-image'
 
 import { lstrings } from '../../locales/strings'
 import { getSwapPluginIconUri } from '../../util/CdnUris'
-import { Airship } from '../services/AirshipInstance'
+import { Airship, showError } from '../services/AirshipInstance'
 import { cacheStyles, type Theme, useTheme } from '../services/ThemeContext'
 import { UnscaledText } from '../text/UnscaledText'
 import { Paragraph } from '../themed/EdgeText'
@@ -88,6 +88,12 @@ function SwapVerifyTermsModal(props: Props) {
   const theme = useTheme()
   const styles = getStyles(theme)
 
+  const handleLink = (url: string): void => {
+    Linking.openURL(url).catch((error: unknown) => {
+      showError(error)
+    })
+  }
+
   return (
     <EdgeModal
       bridge={bridge}
@@ -125,23 +131,29 @@ function SwapVerifyTermsModal(props: Props) {
         {termsUri == null ? null : (
           <UnscaledText
             style={styles.linkText}
-            onPress={async () => await Linking.openURL(termsUri)}
+            onPress={() => {
+              handleLink(termsUri)
+            }}
           >
             {lstrings.swap_terms_terms_link}
           </UnscaledText>
         )}
         {privacyUri == null ? null : (
           <UnscaledText
             style={styles.linkText}
-            onPress={async () => await Linking.openURL(privacyUri)}
+            onPress={() => {
+              handleLink(privacyUri)
+            }}
           >
             {lstrings.swap_terms_privacy_link}
           </UnscaledText>
         )}
         {kycUri == null ? null : (
           <UnscaledText
             style={styles.linkText}
-            onPress={async () => await Linking.openURL(kycUri)}
+            onPress={() => {
+              handleLink(kycUri)
+            }}
           >
             {lstrings.swap_terms_kyc_link}
           </UnscaledText>