Remove @types/react 1.7x override and fix type issues

app/src/components/sheet/Sheet.tsx

@@ -69,7 +69,7 @@ export const Sheet = forwardRef<BottomSheet, SheetProps>(
  onLayout={handleContentLayout}
  style={[styles.contentContainer, contentContainerStyle]}
  >
- {children}
+ <>{children}</>
  </BottomSheetView>
  </BottomSheet>
  );

app/src/components/skeleton/withSuspense.tsx

@@ -2,10 +2,17 @@ import { FC, ReactNode, Suspense } from 'react';
 import { isFunctionalComponent } from '~/util/typing';
 
 export const withSuspense =
- <Props extends {}>(Component: FC<Props>, Fallback: FC<Props> | NonNullable<ReactNode>) =>
+ <Props extends {}, FallbackProps extends Partial<Props & any>>(
+ Component: FC<Props>,
+ Fallback: FC<FallbackProps> | ReactNode,
+ ) =>
  (props: Props) =>
  (
- <Suspense fallback={isFunctionalComponent(Fallback) ? <Fallback {...props} /> : Fallback}>
+ <Suspense
+ fallback={
+ isFunctionalComponent(Fallback) ? <Fallback {...props} /> : (Fallback as ReactNode)
+ }
+ >
  <Component {...props} />
  </Suspense>
  );

app/src/components/tab/TabBadge.tsx

@@ -27,7 +27,7 @@ export const TabBadge = memo(({ style, ...props }: TabBadgeProps) => {
  const width = flattened?.width || isLarge(props) ? 12 + 4 * value.length : 6;
 
  const transform = [
- translateX ? { translateX: translateX.translateX - width } : undefined,
+ translateX ? { translateX: translateX.translateX } : undefined,
  { translateY: 8 },
  ].filter(isPresent);
 

app/src/screens/proposal/TransactionTab.tsx

@@ -18,8 +18,9 @@ import { TabNavigatorScreenProp } from './Tabs';
 import { TabBadge } from '~/components/tab/TabBadge';
 import { makeStyles } from '@theme/makeStyles';
 import { Hex } from 'lib';
+import { ReactNode } from 'react';
 
-const Item = (props: ListItemProps) => (
+const Item = (props: Omit<ListItemProps, 'trailing'> & { trailing: ReactNode }) => (
  <ListItem
  {...props}
  trailing={

package.json

@@ -44,8 +44,7 @@
  "graphql": "^16.6.0",
  "dotenv": "^16.3.1",
  "[email protected]": "patch:react-native-jazzicon@npm:0.1.2#.yarn/patches/react-native-jazzicon-npm-0.1.2-c1633b051f.patch",
- "@ethersproject/abstract-provider": "5.7.0",
- "@types/react": "17.x"
+ "@ethersproject/abstract-provider": "5.7.0"
  },
  "dependencies": {
  "eslint-plugin-neverthrow": "^1.1.4",