PR adjustments

src/components/BasicRow/BasicRowWithContact.tsx

@@ -1,7 +1,6 @@
 import { BasicRow, BasicRowProps } from 'components/BasicRow/index'
 import { Contact } from 'shared/types'
-
-import UserIcon from '../icons/UserIcon'
+import { UserIcon } from 'components/icons/UserIcon'
 
 export interface BasicRowWithContact extends BasicRowProps {
   contact: Contact | undefined

src/components/button/index.tsx

@@ -153,7 +153,7 @@ export const AppButton = ({
         ) : (
           <AppSpinner
             size={buttonHeight - defaultPadding * 2}
-            color={textColor as string}
+            color={textColor.toString()}
           />
         )}
         {rightIcon ? (

src/components/icons/DeployWalletImage.tsx

@@ -2,7 +2,7 @@ import Svg, { ClipPath, Defs, G, Path, Rect, SvgProps } from 'react-native-svg'
 
 import { sharedColors } from 'src/shared/constants'
 
-const DeployWalletImage = ({
+export const DeployWalletImage = ({
   width = 232,
   height = 352,
   ...props
@@ -74,4 +74,3 @@ const DeployWalletImage = ({
     </Defs>
   </Svg>
 )
-export default DeployWalletImage

src/components/icons/HomeIcon.tsx

@@ -4,7 +4,7 @@ import { sharedColors } from 'shared/constants'
 
 import { FooterIconInterface } from '.'
 
-const HomeIcon = ({
+export const HomeIcon = ({
   active = false,
   activeColor = sharedColors.primary,
   ...props
@@ -17,4 +17,3 @@ const HomeIcon = ({
     />
   </Svg>
 )
-export default HomeIcon

src/components/icons/NetworkIcon.tsx

@@ -4,7 +4,7 @@ import { sharedColors } from 'shared/constants'
 
 import { FooterIconInterface } from '.'
 
-const NetworkIcon = ({
+export const NetworkIcon = ({
   active = false,
   activeColor = sharedColors.primary,
   ...props
@@ -17,4 +17,3 @@ const NetworkIcon = ({
     />
   </Svg>
 )
-export default NetworkIcon

src/components/icons/UserIcon.tsx

@@ -22,5 +22,3 @@ export const UserIcon = ({
     />
   </Svg>
 )
-
-export default UserIcon

src/components/icons/index.tsx

@@ -1,4 +1,4 @@
-import { StyleProp, TextProps, TextStyle } from 'react-native'
+import { ColorValue, StyleProp, TextProps, TextStyle } from 'react-native'
 import { SvgProps } from 'react-native-svg'
 
 export interface SVGIconInterface {
@@ -15,7 +15,7 @@ export interface MaterialIconInterface extends TextProps {
 
 export interface FooterIconInterface extends SvgProps {
   active?: boolean
-  activeColor?: string
+  activeColor?: ColorValue
 }
 
 export { Arrow } from './Arrow'

src/screens/settings/RelayDeployScreen.tsx

@@ -20,7 +20,7 @@ import { sharedHeaderLeftOptions } from 'navigation/index'
 import { rootTabsRouteNames } from 'navigation/rootNavigator'
 import { homeStackRouteNames } from 'navigation/homeNavigator/types'
 import { useWholeWalletWithSetters } from 'shared/wallet'
-import DeployWalletImage from 'src/components/icons/DeployWalletImage'
+import { DeployWalletImage } from 'components/icons/DeployWalletImage'
 
 import { TokenSymbol } from '../home/TokenImage'
 

src/ux/appFooter/index.tsx

@@ -7,8 +7,8 @@ import { homeStackRouteNames } from 'navigation/homeNavigator/types'
 import { rootTabsRouteNames } from 'navigation/rootNavigator'
 import { sharedColors, sharedStyles } from 'shared/constants'
 import { castStyle } from 'shared/utils'
-import HomeIcon from 'components/icons/HomeIcon'
-import NetworkIcon from 'components/icons/NetworkIcon'
+import { HomeIcon } from 'components/icons/HomeIcon'
+import { NetworkIcon } from 'components/icons/NetworkIcon'
 import { ScanIcon } from 'components/icons/ScanIcon'
 import TransactionsIcon from 'components/icons/TransactionsIcon'
 import UsersIcon from 'components/icons/UsersIcon'