diff --git a/package.json b/package.json
index f2e501809c2..569729e8734 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "ts-node": "^8.3.0",
     "tsconfig-paths": "^3.8.0",
     "tslint": "^5.20.0",
-    "typescript": "^3.7.3",
+    "typescript": "^3.5.3",
     "typescript-tslint-plugin": "^0.5.4"
   },
   "dependencies": {
diff --git a/packages/blockchain-api/package.json b/packages/blockchain-api/package.json
index d8ed27a330e..d6ad93b5723 100644
--- a/packages/blockchain-api/package.json
+++ b/packages/blockchain-api/package.json
@@ -36,7 +36,7 @@
     "@types/web3": "^1.0.18",
     "jest-fetch-mock": "^2.1.2",
     "tsc-watch": "^1.0.31",
-    "typescript": "^3.7.3"
+    "typescript": "^3.5.3"
   },
   "resolutions": {
     "**/cross-fetch": "3.0.4"
diff --git a/packages/celotool/src/cmds/deploy/upgrade/ethstats.ts b/packages/celotool/src/cmds/deploy/upgrade/ethstats.ts
index b127f4299f3..cd7fa33222f 100644
--- a/packages/celotool/src/cmds/deploy/upgrade/ethstats.ts
+++ b/packages/celotool/src/cmds/deploy/upgrade/ethstats.ts
@@ -23,7 +23,7 @@ export const handler = async (argv: EthstatsArgv) => {
   await createClusterIfNotExists()
   await switchToClusterFromEnv()
 
-  if (argv.reset === true) {
+  if (argv.reset) {
     await removeHelmRelease(argv.celoEnv)
     await installHelmChart(argv.celoEnv)
   } else {
diff --git a/packages/celotool/src/cmds/deploy/upgrade/leaderboard.ts b/packages/celotool/src/cmds/deploy/upgrade/leaderboard.ts
index 376ba09030f..059eea67fd0 100644
--- a/packages/celotool/src/cmds/deploy/upgrade/leaderboard.ts
+++ b/packages/celotool/src/cmds/deploy/upgrade/leaderboard.ts
@@ -23,7 +23,7 @@ export const handler = async (argv: LeaderboardArgv) => {
   await createClusterIfNotExists()
   await switchToClusterFromEnv()
 
-  if (argv.reset === true) {
+  if (argv.reset) {
     await removeHelmRelease(argv.celoEnv)
     await installHelmChart(argv.celoEnv)
   } else {
diff --git a/packages/celotool/src/cmds/deploy/upgrade/testnet.ts b/packages/celotool/src/cmds/deploy/upgrade/testnet.ts
index 9a0df3bb5f9..1cae9afa895 100644
--- a/packages/celotool/src/cmds/deploy/upgrade/testnet.ts
+++ b/packages/celotool/src/cmds/deploy/upgrade/testnet.ts
@@ -31,7 +31,7 @@ export const handler = async (argv: TestnetArgv) => {
 
   await upgradeStaticIPs(argv.celoEnv)
 
-  if (argv.reset === true) {
+  if (argv.reset) {
     await resetAndUpgradeHelmChart(argv.celoEnv)
     await uploadGenesisBlockToGoogleStorage(argv.celoEnv)
   } else {
diff --git a/packages/celotool/src/cmds/deploy/upgrade/vm-testnet.ts b/packages/celotool/src/cmds/deploy/upgrade/vm-testnet.ts
index 7f0b5721e9b..aaa1d69e04d 100644
--- a/packages/celotool/src/cmds/deploy/upgrade/vm-testnet.ts
+++ b/packages/celotool/src/cmds/deploy/upgrade/vm-testnet.ts
@@ -31,7 +31,7 @@ export const handler = async (argv: VmTestnetArgv) => {
   await switchToClusterFromEnv()
 
   let onDeployFailed = () => Promise.resolve()
-  if (argv.reset === true) {
+  if (argv.reset) {
     onDeployFailed = () => untaintTestnet(argv.celoEnv)
     await taintTestnet(argv.celoEnv)
   }
diff --git a/packages/cli/package.json b/packages/cli/package.json
index bae8ef91cb4..dccaa4b8449 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -67,7 +67,7 @@
     "@types/web3": "^1.0.18",
     "globby": "^8",
     "prettier": "1.13.5",
-    "typescript": "^3.7.3"
+    "typescript": "^3.5.3"
   },
   "files": [
     "README.md",
diff --git a/packages/notification-service/package.json b/packages/notification-service/package.json
index 642b629c631..bce9ae88696 100644
--- a/packages/notification-service/package.json
+++ b/packages/notification-service/package.json
@@ -39,7 +39,7 @@
     "@types/node-fetch": "^2.1.2",
     "@types/utf8": "^2.1.6",
     "@types/web3": "^1.0.18",
-    "typescript": "^3.7.3"
+    "typescript": "^3.5.3"
   },
   "engines": {
     "node": "10"
diff --git a/packages/react-components/analytics/wrapper.tsx b/packages/react-components/analytics/wrapper.tsx
index 1cd99e41136..fedb2665d74 100644
--- a/packages/react-components/analytics/wrapper.tsx
+++ b/packages/react-components/analytics/wrapper.tsx
@@ -4,45 +4,29 @@ import CeloAnalyticsType from '@celo/react-components/analytics/CeloAnalytics'
 import { DefaultEventNames } from '@celo/react-components/analytics/constants'
 import ReactNativeLogger from '@celo/react-components/services/ReactNativeLogger'
 import * as React from 'react'
-// tslint:disable-next-line
-import { Component, ComponentType, forwardRef, Ref } from 'react'
 
 function getDisplayName<P extends {}>(WrappedComponent: React.ComponentType<P>) {
   return WrappedComponent.displayName || WrappedComponent.name || 'Component'
 }
 
+interface ForwardedRef {
+  forwardedRef?: React.Ref<React.ReactElement<any>>
+}
+
 export default function Initializer(CeloAnalytics: CeloAnalyticsType, Logger: ReactNativeLogger) {
-  // Wrapper type: https://gist.github.com/OliverJAsh/d2f462b03b3e6c24f5588ca7915d010e
+  // Wrapper type: https://medium.com/@jrwebdev/react-higher-order-component-patterns-in-typescript-42278f7590fb
   // Component name: https://reactjs.org/docs/forwarding-refs.html
 
-  function componentWithAnalytics<ComposedComponentProps extends {}>(
-    ComposedComponent: ComponentType<ComposedComponentProps>
-  ) {
-    const displayName = getDisplayName(ComposedComponent)
-    // @ts-ignore
-    type ComposedComponentInstance = InstanceType<typeof ComposedComponent>
-    type WrapperComponentProps = ComposedComponentProps & {
-      wrapperComponentProp: number
-    }
-    type WrapperComponentPropsWithForwardedRef = WrapperComponentProps & {
-      forwardedRef: Ref<ComposedComponentInstance>
-    }
+  function componentWithAnalytics<P extends {}>(
+    WrappedComponent: React.ComponentType<P>
+  ): React.ComponentClass<P> {
+    const displayName = getDisplayName(WrappedComponent)
 
-    class WrapperComponent extends Component<WrapperComponentPropsWithForwardedRef, {}> {
+    class ComponentWithAnalytics extends React.Component<P & ForwardedRef> {
       timestamp: number | undefined
 
       render() {
-        const { forwardedRef, wrapperComponentProp, ...composedComponentProps } = this.props
-
-        return (
-          <ComposedComponent
-            ref={forwardedRef}
-            // We need a cast because:
-            // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/32355
-            // https://github.com/Microsoft/TypeScript/issues/28938#issuecomment-450636046
-            {...composedComponentProps as ComposedComponentProps}
-          />
-        )
+        return <WrappedComponent {...this.props} ref={this.props.forwardedRef} />
       }
 
       trackEvent(event: any, props: any, attachDeviceInfo = false) {
@@ -74,16 +58,13 @@ export default function Initializer(CeloAnalytics: CeloAnalyticsType, Logger: Re
       }
     }
 
-    function forward(props: WrapperComponentProps, ref: Ref<ComposedComponentInstance>) {
-      return <WrapperComponent forwardedRef={ref} {...props} />
+    function forwardRef(props: P, ref: any) {
+      return <ComponentWithAnalytics {...props} forwardedRef={ref} />
     }
 
-    forward.displayName = `WithAnalytics(${displayName})`
+    forwardRef.displayName = `WithAnalytics(${displayName})`
 
-    return hoistNonReactStatics(
-      forwardRef<ComposedComponentInstance, WrapperComponentProps>(forward),
-      ComposedComponent
-    )
+    return hoistNonReactStatics(React.forwardRef(forwardRef), WrappedComponent)
   }
   return componentWithAnalytics
 }
diff --git a/packages/react-components/components/TextInput.tsx b/packages/react-components/components/TextInput.tsx
index ac5645eee42..20d5650e8bc 100644
--- a/packages/react-components/components/TextInput.tsx
+++ b/packages/react-components/components/TextInput.tsx
@@ -11,7 +11,7 @@ import {
   StyleSheet,
   TextInput as RNTextInput,
   TextInputFocusEventData,
-  TextInputProps as RNTextInputProps,
+  TextInputProps,
   View,
 } from 'react-native'
 
@@ -22,7 +22,7 @@ interface OwnProps {
   forwardedRef?: React.RefObject<RNTextInput>
 }
 
-type Props = OwnProps & RNTextInputProps
+type Props = OwnProps & TextInputProps
 
 interface State {
   isFocused: boolean
diff --git a/yarn.lock b/yarn.lock
index 0b4b4ef883d..8ccb54161ef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -32013,16 +32013,16 @@ typescript@^3.2.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3.tgz#f1657fc7daa27e1a8930758ace9ae8da31403221"
   integrity sha512-Y21Xqe54TBVp+VDSNbuDYdGw0BpoR/Q6wo/+35M8PAU0vipahnyduJWirxxdxjsAkS7hue53x2zp8gz7F05u0A==
 
+typescript@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
+  integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
+
 typescript@^3.6.4:
   version "3.6.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.4.tgz#b18752bb3792bc1a0281335f7f6ebf1bbfc5b91d"
   integrity sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg==
 
-typescript@^3.7.3:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.3.tgz#b36840668a16458a7025b9eabfad11b66ab85c69"
-  integrity sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==
-
 typewise-core@^1.2, typewise-core@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/typewise-core/-/typewise-core-1.2.0.tgz#97eb91805c7f55d2f941748fa50d315d991ef195"