@oxyhq/services 6.9.0 → 6.9.1

package/lib/typescript/types/expo-secure-store.d.ts

@@ -13,10 +13,10 @@ declare module 'expo-secure-store' {
   export const AFTER_FIRST_UNLOCK_THIS_DEVICE_ONLY: 'AFTER_FIRST_UNLOCK_THIS_DEVICE_ONLY';
   export const WHEN_PASSCODE_SET_THIS_DEVICE_ONLY: 'WHEN_PASSCODE_SET_THIS_DEVICE_ONLY';
 
-  export async function setItemAsync(key: string, value: string, options?: SecureStoreOptions): Promise<void>;
-  export async function getItemAsync(key: string, options?: SecureStoreOptions): Promise<string | null>;
-  export async function deleteItemAsync(key: string, options?: SecureStoreOptions): Promise<void>;
-  export async function isAvailableAsync(): Promise<boolean>;
+  export function setItemAsync(key: string, value: string, options?: SecureStoreOptions): Promise<void>;
+  export function getItemAsync(key: string, options?: SecureStoreOptions): Promise<string | null>;
+  export function deleteItemAsync(key: string, options?: SecureStoreOptions): Promise<void>;
+  export function isAvailableAsync(): Promise<boolean>;
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "6.9.0",
+  "version": "6.9.1",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package/src/types/expo-crypto.d.ts

@@ -9,7 +9,7 @@ declare module 'expo-crypto' {
     MD4 = 'MD4',
   }
 
-  export async function digestStringAsync(
+  export function digestStringAsync(
     algorithm: CryptoDigestAlgorithm | 'MD5' | 'SHA1' | 'SHA256' | 'SHA384' | 'SHA512',
     data: string,
     options?: { encoding?: 'base64' | 'hex' }

package/src/types/expo-secure-store.d.ts

@@ -13,10 +13,10 @@ declare module 'expo-secure-store' {
   export const AFTER_FIRST_UNLOCK_THIS_DEVICE_ONLY: 'AFTER_FIRST_UNLOCK_THIS_DEVICE_ONLY';
   export const WHEN_PASSCODE_SET_THIS_DEVICE_ONLY: 'WHEN_PASSCODE_SET_THIS_DEVICE_ONLY';
 
-  export async function setItemAsync(key: string, value: string, options?: SecureStoreOptions): Promise<void>;
-  export async function getItemAsync(key: string, options?: SecureStoreOptions): Promise<string | null>;
-  export async function deleteItemAsync(key: string, options?: SecureStoreOptions): Promise<void>;
-  export async function isAvailableAsync(): Promise<boolean>;
+  export function setItemAsync(key: string, value: string, options?: SecureStoreOptions): Promise<void>;
+  export function getItemAsync(key: string, options?: SecureStoreOptions): Promise<string | null>;
+  export function deleteItemAsync(key: string, options?: SecureStoreOptions): Promise<void>;
+  export function isAvailableAsync(): Promise<boolean>;
 }
 
 

package/src/ui/components/ActivityIndicator.tsx

@@ -3,10 +3,10 @@ import {
   Animated,
   Easing,
   Platform,
-  StyleProp,
+  type StyleProp,
   StyleSheet,
   View,
-  ViewStyle,
+  type ViewStyle,
 } from 'react-native';
 
 import { useInternalTheme } from './theming';
@@ -94,13 +94,13 @@ const ActivityIndicator = ({
       // $FlowFixMe
       Animated.loop(rotation.current).start();
     }
-  }, [scale, fade, timer]);
+  }, [scale]);
 
-  const stopRotation = () => {
+  const stopRotation = React.useCallback(() => {
     if (rotation.current) {
       rotation.current.stop();
     }
-  };
+  }, []);
 
   React.useEffect(() => {
     if (rotation.current === undefined) {
@@ -128,7 +128,7 @@ const ActivityIndicator = ({
     } else {
       stopRotation();
     }
-  }, [animating, fade, hidesWhenStopped, startRotation, scale, timer]);
+  }, [animating, hidesWhenStopped, startRotation, stopRotation, scale]);
 
   const color = indicatorColor || theme.colors?.primary;
   const size =

package/src/ui/components/BottomSheet.tsx

@@ -1,4 +1,5 @@
-import React, { forwardRef, useImperativeHandle, useRef, useEffect, useState, useCallback, useMemo } from 'react';
+import type React from 'react';
+import { forwardRef, useImperativeHandle, useRef, useEffect, useState, useCallback, useMemo } from 'react';
 import {
     View,
     StyleSheet,
@@ -8,9 +9,8 @@ import {
     Platform,
     type ViewStyle,
     type StyleProp,
-    ScrollView,
 } from 'react-native';
-import { Gesture, GestureDetector, GestureHandlerRootView } from 'react-native-gesture-handler';
+import { Gesture, GestureDetector } from 'react-native-gesture-handler';
 import { useKeyboardHandler } from 'react-native-keyboard-controller';
 import Animated, {
     interpolate,
@@ -72,7 +72,7 @@ const BottomSheet = forwardRef((props: BottomSheetProps, ref: React.ForwardedRef
     const [rendered, setRendered] = useState(false); // keep mounted for exit animation
     const closeTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
     const hasClosedRef = useRef(false);
-    const scrollViewRef = useRef<ScrollView>(null);
+    const scrollViewRef = useRef<Animated.ScrollView>(null);
 
     const translateY = useSharedValue(SCREEN_HEIGHT);
     const opacity = useSharedValue(0);
@@ -305,7 +305,7 @@ const BottomSheet = forwardRef((props: BottomSheetProps, ref: React.ForwardedRef
 
     return (
         <Modal visible={rendered} transparent animationType="none" statusBarTranslucent onRequestClose={dismiss}>
-            <GestureHandlerRootView style={StyleSheet.absoluteFill}>
+            <View style={StyleSheet.absoluteFill}>
                 <Animated.View style={[styles.backdrop, backdropStyle]}>
                     {backdropComponent ? (
                         backdropComponent({ onPress: handleBackdropPress })
@@ -324,21 +324,20 @@ const BottomSheet = forwardRef((props: BottomSheetProps, ref: React.ForwardedRef
 
                         <GestureDetector gesture={nativeGesture}>
                             <Animated.ScrollView
-                                ref={scrollViewRef as any}
+                                ref={scrollViewRef}
                                 style={[
                                     styles.scrollView,
-                                    Platform.OS === 'web' && {
-                                        scrollbarWidth: 'thin' as const,
+                                    Platform.OS === 'web' && ({
+                                        scrollbarWidth: 'thin',
                                         scrollbarColor: `${colors.border} transparent`,
-                                    } as any,
+                                    } as ViewStyle),
                                 ]}
                                 contentContainerStyle={dynamicStyles.scrollContent}
                                 showsVerticalScrollIndicator={false}
                                 keyboardShouldPersistTaps="handled"
                                 onScroll={scrollHandler}
                                 scrollEventThrottle={16}
-                                // @ts-ignore - Web className
-                                className={Platform.OS === 'web' ? 'bottom-sheet-scrollview' : undefined}
+                                {...(Platform.OS === 'web' ? { className: 'bottom-sheet-scrollview' } : undefined)}
                                 onLayout={() => {
                                     if (Platform.OS === 'web') {
                                         createWebScrollbarStyle(colors.border);
@@ -350,7 +349,7 @@ const BottomSheet = forwardRef((props: BottomSheetProps, ref: React.ForwardedRef
                         </GestureDetector>
                     </Animated.View>
                 </GestureDetector>
-            </GestureHandlerRootView>
+            </View>
         </Modal>
     );
 });

package/src/ui/components/BottomSheetRouter.tsx

@@ -1,5 +1,5 @@
-import React, { useRef, useEffect, useCallback, useMemo } from 'react';
-import { BackHandler, View, StyleSheet, type StyleProp, type ViewStyle } from 'react-native';
+import React, { useRef, useEffect, useCallback, useMemo, type ErrorInfo } from 'react';
+import { BackHandler, View, StyleSheet, Text, type StyleProp, type ViewStyle } from 'react-native';
 import { useStore } from 'zustand';
 import type { RouteName } from '../navigation/routes';
 import { getScreenComponent, isValidRoute } from '../navigation/routes';
@@ -16,6 +16,58 @@ import {
     updateState,
 } from '../navigation/bottomSheetManager';
 
+/** Error boundary to catch screen rendering failures (e.g. lazy require() throws) */
+interface ScreenErrorBoundaryState {
+    error: Error | null;
+}
+
+class ScreenErrorBoundary extends React.Component<
+    { screenName: string; children: React.ReactNode },
+    ScreenErrorBoundaryState
+> {
+    state: ScreenErrorBoundaryState = { error: null };
+
+    static getDerivedStateFromError(error: Error): ScreenErrorBoundaryState {
+        return { error };
+    }
+
+    componentDidCatch(error: Error, info: ErrorInfo): void {
+        if (__DEV__) {
+            console.error(
+                `[BottomSheetRouter] Screen "${this.props.screenName}" crashed:`,
+                error,
+                info.componentStack,
+            );
+        }
+    }
+
+    componentDidUpdate(prevProps: { screenName: string }): void {
+        if (prevProps.screenName !== this.props.screenName && this.state.error) {
+            this.setState({ error: null });
+        }
+    }
+
+    render(): React.ReactNode {
+        if (this.state.error) {
+            return (
+                <View style={errorStyles.container}>
+                    <Text style={errorStyles.title}>Something went wrong</Text>
+                    {__DEV__ && (
+                        <Text style={errorStyles.message}>{this.state.error.message}</Text>
+                    )}
+                </View>
+            );
+        }
+        return this.props.children;
+    }
+}
+
+const errorStyles = StyleSheet.create({
+    container: { flex: 1, alignItems: 'center', justifyContent: 'center', padding: 24 },
+    title: { fontSize: 16, fontWeight: '600', marginBottom: 8 },
+    message: { fontSize: 13, color: '#888', textAlign: 'center' },
+});
+
 export interface BottomSheetRouterProps {
     onScreenChange?: (screen: RouteName | null) => void;
     onDismiss?: () => void;
@@ -32,10 +84,16 @@ const BottomSheetRouter: React.FC<BottomSheetRouterProps> = ({ onScreenChange, o
 
     const { currentScreen, screenProps, currentStep, isOpen } = useStore(bottomSheetStore);
 
-    const ScreenComponent = useMemo(
-        () => (currentScreen ? getScreenComponent(currentScreen) : null),
-        [currentScreen]
-    );
+    const ScreenComponent = useMemo(() => {
+        if (!currentScreen) return null;
+        const component = getScreenComponent(currentScreen);
+        if (__DEV__ && !component) {
+            console.error(
+                `[BottomSheetRouter] getScreenComponent("${currentScreen}") returned undefined — the screen's lazy require() likely failed.`,
+            );
+        }
+        return component ?? null;
+    }, [currentScreen]);
 
     // Notify screen changes
     useEffect(() => {
@@ -163,7 +221,11 @@ const BottomSheetRouter: React.FC<BottomSheetRouterProps> = ({ onScreenChange, o
             onDismiss={handleDismiss}
             onDismissAttempt={handleDismissAttempt}
         >
-            {ScreenComponent && currentScreen && <ScreenComponent {...screenPropsValue} />}
+            {ScreenComponent && currentScreen && (
+                <ScreenErrorBoundary screenName={currentScreen}>
+                    <ScreenComponent {...screenPropsValue} />
+                </ScreenErrorBoundary>
+            )}
         </BottomSheet>
     );
 };

package/src/ui/components/CrossFadeIcon.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Animated, StyleSheet, View } from 'react-native';
 
-import Icon, { IconSource, isEqualIcon, isValidIcon } from './Icon';
+import Icon, { type IconSource, isEqualIcon, isValidIcon } from './Icon';
 import { useInternalTheme } from './theming';
 import type { ThemeProp } from './types';
 
@@ -61,7 +61,7 @@ const CrossFadeIcon = ({
         useNativeDriver: true,
       }).start();
     }
-  }, [currentIcon, previousIcon, fade, scale]);
+  }, [currentIcon, previousIcon, scale]);
 
   const opacityPrev = fade;
   const opacityNext = previousIcon

package/src/ui/components/ErrorBoundary.tsx

@@ -1,4 +1,4 @@
-import React, { Component, ErrorInfo, ReactNode } from 'react';
+import React, { Component, type ErrorInfo, type ReactNode } from 'react';
 import { View, Text, StyleSheet, TouchableOpacity } from 'react-native';
 
 interface Props {

package/src/ui/components/FollowButton.tsx

@@ -111,12 +111,11 @@ const FollowButton: React.FC<FollowButtonProps> = ({
     }
   }, [disabled, isLoading, toggleFollow, onFollowChange, isFollowing, preventParentActions, scale]);
 
-  // Initialize Zustand state with initial value if not already set
+  // biome-ignore lint/correctness/useExhaustiveDependencies: intentional mount-only initialization
   useEffect(() => {
     if (userId && !isFollowing && initiallyFollowing) {
       setFollowStatus?.(initiallyFollowing);
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [userId, initiallyFollowing]);
 
   // Fetch latest follow status from backend on mount if authenticated
@@ -124,13 +123,12 @@ const FollowButton: React.FC<FollowButtonProps> = ({
     if (userId && isAuthenticated) {
       fetchStatus?.();
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [userId, oxyServices, isAuthenticated]);
+  }, [userId, fetchStatus, isAuthenticated]);
 
   // Animate button on follow/unfollow
   useEffect(() => {
     animationProgress.value = withTiming(isFollowing ? 1 : 0, { duration: 300, easing: Easing.inOut(Easing.ease) });
-  }, [isFollowing]);
+  }, [isFollowing, animationProgress]);
 
   // Animated styles for better performance
   const animatedButtonStyle = useAnimatedStyle(() => {

package/src/ui/components/FontLoader.tsx

@@ -1,4 +1,5 @@
-import React, { useState, useEffect } from 'react';
+import type React from 'react';
+import { useState, useEffect } from 'react';
 import { Platform } from 'react-native';
 import * as Font from 'expo-font';
 

package/src/ui/components/GroupedItem.tsx

@@ -1,7 +1,7 @@
-import React, { memo, useMemo } from 'react';
+import type React from 'react';
+import { memo, useMemo } from 'react';
 import { View, Text, TouchableOpacity, StyleSheet } from 'react-native';
 import { Ionicons } from '@expo/vector-icons';
-// @ts-ignore - MaterialCommunityIcons is available at runtime
 import { MaterialCommunityIcons } from '@expo/vector-icons';
 import { useColorScheme } from '../hooks/useColorScheme';
 import { darkenColor } from '../utils/colorUtils';
@@ -68,7 +68,7 @@ const GroupedItemComponent = ({
                 <View style={styles.actionIcon}>{customIcon}</View>
             ) : icon ? (
                 <View style={[styles.iconContainer, { backgroundColor: finalIconColor }]}>
-                    <MaterialCommunityIcons name={icon as any} size={22} color={darkenColor(finalIconColor)} />
+                    <MaterialCommunityIcons name={icon} size={22} color={darkenColor(finalIconColor)} />
                 </View>
             ) : null}
             <View style={styles.actionTextContainer}>

package/src/ui/components/GroupedSection.tsx

@@ -1,4 +1,5 @@
-import React, { memo } from 'react';
+import type React from 'react';
+import { memo } from 'react';
 import { View } from 'react-native';
 import { GroupedItem } from './GroupedItem';
 import { Ionicons } from '@expo/vector-icons';

package/src/ui/components/Header.tsx

@@ -19,7 +19,7 @@ import { normalizeColorScheme } from '../utils/themeUtils';
 import { Colors } from '../constants/theme';
 
 // Calculate header height based on platform and variant
-export const getHeaderHeight = (variant: HeaderProps['variant'] = 'default', safeAreaTop: number = 0): number => {
+export const getHeaderHeight = (variant: HeaderProps['variant'] = 'default', safeAreaTop = 0): number => {
     const paddingTop = Platform.OS === 'ios' ? Math.max(safeAreaTop, 50) : 16;
     const paddingBottom = 12;
     const contentHeight = variant === 'minimal' ? 36 : 40;

package/src/ui/components/HelperText.tsx

@@ -1,10 +1,10 @@
 import * as React from 'react';
 import {
   Animated,
-  LayoutChangeEvent,
-  StyleProp,
+  type LayoutChangeEvent,
+  type StyleProp,
   StyleSheet,
-  TextStyle,
+  type TextStyle,
 } from 'react-native';
 import { useThemeColors } from '../styles';
 
@@ -14,7 +14,7 @@ const getTextColor = (colors: ReturnType<typeof useThemeColors>, disabled?: bool
     return colors.error;
   }
   if (disabled) {
-    return colors.secondaryText + '80'; // Add opacity
+    return `${colors.secondaryText}80`; // Add opacity
   }
   return colors.secondaryText;
 };
@@ -109,7 +109,7 @@ const HelperText = ({
       return colors.error;
     }
     if (disabled) {
-      return colors.secondaryText + '80'; // Add opacity
+      return `${colors.secondaryText}80`; // Add opacity
     }
     return colors.secondaryText;
   };

package/src/ui/components/Icon.tsx

@@ -1,8 +1,8 @@
-import * as React from 'react';
+import type * as React from 'react';
 import {
   I18nManager,
   Image,
-  ImageSourcePropType,
+  type ImageSourcePropType,
   Platform,
 } from 'react-native';
 import { MaterialCommunityIcons } from '@expo/vector-icons';
@@ -141,14 +141,14 @@ const Icon = ({
             width: size,
             height: size,
             tintColor: color,
-            resizeMode: `contain`,
+            resizeMode: "contain",
           },
         ]}
         {...accessibilityProps}
         accessibilityIgnoresInvertColors
       />
     );
-  } else if (typeof s === 'string') {
+  }if (typeof s === 'string') {
     // String icons - use MaterialCommunityIcons from @expo/vector-icons
     // This is the default icon library used by react-native-paper
     const styleArray = Array.isArray(rest.style)
@@ -171,7 +171,7 @@ const Icon = ({
         {...accessibilityProps}
       />
     );
-  } else if (typeof s === 'function') {
+  }if (typeof s === 'function') {
     return s({ color: iconColor, size, direction, testID });
   }
 

package/src/ui/components/IconButton/IconButton.tsx

@@ -1,12 +1,12 @@
-import * as React from 'react';
+import type * as React from 'react';
 import {
-  GestureResponderEvent,
-  StyleProp,
+  type GestureResponderEvent,
+  type StyleProp,
   StyleSheet,
-  ViewStyle,
-  View,
-  Animated,
-  ColorValue,
+  type ViewStyle,
+  type View,
+  type Animated,
+  type ColorValue,
 } from 'react-native';
 
 import { getIconButtonColor } from './utils';
@@ -15,7 +15,7 @@ import type { $RemoveChildren, ThemeProp } from "../types";
 import { forwardRef } from '../utils/forwardRef';
 import ActivityIndicator from '../ActivityIndicator';
 import CrossFadeIcon from '../CrossFadeIcon';
-import Icon, { IconSource } from '../Icon';
+import Icon, { type IconSource } from '../Icon';
 import Surface from '../Surface';
 import TouchableRipple from '../TouchableRipple/TouchableRipple';
 

package/src/ui/components/OxyProvider.tsx

@@ -1,9 +1,10 @@
+import type React from 'react';
 import { useEffect, useRef, useState, type FC } from 'react';
 import { AppState, Platform } from 'react-native';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import type { OxyProviderProps } from '../types/navigation';
-import { OxyContextProvider } from '../context/OxyContext';
+import { OxyContextProvider, type OxyContextProviderProps } from '../context/OxyContext';
 import { QueryClientProvider, focusManager, onlineManager } from '@tanstack/react-query';
 import { setupFonts } from './FontLoader';
 import { Toaster } from '../../lib/sonner';
@@ -17,9 +18,9 @@ setupFonts();
 const isWeb = Platform.OS === 'web';
 
 // Conditionally import components
-let KeyboardProvider: any = ({ children }: any) => children;
-let BottomSheetRouter: any = null;
-let SignInModal: any = null;
+let KeyboardProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => <>{children}</>;
+let BottomSheetRouter: React.ComponentType | null = null;
+let SignInModal: React.ComponentType | null = null;
 
 // KeyboardProvider only on native
 if (!isWeb) {
@@ -33,8 +34,10 @@ if (!isWeb) {
 // BottomSheetRouter works on all platforms
 try {
     BottomSheetRouter = require('./BottomSheetRouter').default;
-} catch {
-    // BottomSheetRouter not available
+} catch (error) {
+    if (__DEV__) {
+        console.error('[OxyProvider] Failed to load BottomSheetRouter:', error);
+    }
 }
 
 // SignInModal works on all platforms
@@ -44,6 +47,10 @@ try {
     // SignInModal not available
 }
 
+if (__DEV__ && !BottomSheetRouter) {
+    console.warn('[OxyProvider] BottomSheetRouter is null — bottom sheet navigation will not work. Check that BottomSheetRouter.tsx and its dependencies are importable.');
+}
+
 /**
  * OxyProvider - Universal provider for Expo apps (native + web)
  *
@@ -135,7 +142,7 @@ const OxyProvider: FC<OxyProviderProps> = ({
             return () => {
                 document.removeEventListener('visibilitychange', handleVisibilityChange);
             };
-        } else {
+        }
             // Native: use AppState
             const subscription = AppState.addEventListener('change', (state) => {
                 focusManager.setFocused(state === 'active');
@@ -143,7 +150,6 @@ const OxyProvider: FC<OxyProviderProps> = ({
             return () => {
                 subscription.remove();
             };
-        }
     }, []);
 
     // Setup network status monitoring for offline detection
@@ -204,12 +210,12 @@ const OxyProvider: FC<OxyProviderProps> = ({
     const coreContent = (
         <QueryClientProvider client={queryClient}>
             <OxyContextProvider
-                oxyServices={oxyServices as any}
+                oxyServices={oxyServices as OxyContextProviderProps['oxyServices']}
                 baseURL={baseURL}
                 authWebUrl={authWebUrl}
                 authRedirectUri={authRedirectUri}
                 storageKeyPrefix={storageKeyPrefix}
-                onAuthStateChange={onAuthStateChange as any}
+                onAuthStateChange={onAuthStateChange as OxyContextProviderProps['onAuthStateChange']}
             >
                 {children}
                 {/* Only render bottom sheet router on native */}

package/src/ui/components/SignInModal.tsx

@@ -8,7 +8,8 @@
  * Animates with fade-in effect.
  */
 
-import React, { useState, useEffect, useCallback, useRef } from 'react';
+import type React from 'react';
+import { useState, useEffect, useCallback, useRef } from 'react';
 import {
     View,
     Text,

package/src/ui/components/Surface.tsx

@@ -2,11 +2,11 @@ import * as React from 'react';
 import {
   Animated,
   Platform,
-  ShadowStyleIOS,
-  StyleProp,
+  type ShadowStyleIOS,
+  type StyleProp,
   StyleSheet,
-  View,
-  ViewStyle,
+  type View,
+  type ViewStyle,
 } from 'react-native';
 
 import { useInternalTheme } from './theming';

package/src/ui/components/TextField/Addons/Outline.tsx

@@ -1,13 +1,13 @@
 import * as React from 'react';
 import {
   StyleSheet,
-  ColorValue,
-  StyleProp,
+  type ColorValue,
+  type StyleProp,
   View,
-  ViewStyle,
+  type ViewStyle,
 } from 'react-native';
 
-import { TextInputLabelProp } from '../types';
+import type { TextInputLabelProp } from '../types';
 
 type OutlineProps = {
   isV3: boolean;

package/src/ui/components/TextField/Addons/Underline.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Animated, StyleSheet, StyleProp, ViewStyle } from 'react-native';
+import { Animated, StyleSheet, type StyleProp, type ViewStyle } from 'react-native';
 
 import type { ThemeProp } from '../../types';
 

package/src/ui/components/TextField/Adornment/TextFieldAdornment.tsx

@@ -25,7 +25,7 @@ export function getAdornmentConfig({
   left?: React.ReactNode;
   right?: React.ReactNode;
 }): Array<AdornmentConfig> {
-  let adornmentConfig: any[] = [];
+  const adornmentConfig: any[] = [];
   if (left || right) {
     [
       { side: AdornmentSide.Left, adornment: left },
@@ -104,9 +104,8 @@ export function getAdornmentStyleAdjustmentForNativeInput({
         {}
       );
     return allStyleAdjustmentsMerged;
-  } else {
-    return [{}];
   }
+    return [{}];
 }
 
 const captalize = (text: string) =>
@@ -181,7 +180,7 @@ const TextFieldAdornment: React.FunctionComponent<TextFieldAdornmentProps> = ({
                 forceFocus={forceFocus}
               />
             );
-          } else if (type === AdornmentType.Affix) {
+          }if (type === AdornmentType.Affix) {
             return (
               <AffixAdornment
                 {...commonProps}
@@ -194,15 +193,13 @@ const TextFieldAdornment: React.FunctionComponent<TextFieldAdornmentProps> = ({
                 maxFontSizeMultiplier={maxFontSizeMultiplier}
               />
             );
-          } else {
-            return null;
           }
+            return null;
         })}
       </>
     );
-  } else {
-    return null;
   }
+    return null;
 };
 
 export default TextFieldAdornment;