Merge pull request #10827 from brave/typescript-444

brave · Nov 8, 2021 · 9b734cd · 9b734cd
2 parents 52046f9 + a82e73b
commit 9b734cd
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 22 deletions.
diff --git a/components/brave_extension/extension/brave_extension/background/today/feed.ts b/components/brave_extension/extension/brave_extension/background/today/feed.ts
@@ -86,8 +86,8 @@ async function getStorageData () {
 }
 
 function clearStorageData () {
-  return new Promise(resolve => {
-    chrome.storage.local.remove(STORAGE_KEY, resolve)
+  return new Promise<void>(resolve => {
+    chrome.storage.local.remove(STORAGE_KEY, () => resolve())
   })
 }
 

diff --git a/components/brave_new_tab_ui/components/default/clock/index.tsx b/components/brave_new_tab_ui/components/default/clock/index.tsx
@@ -39,7 +39,7 @@ class Clock extends React.PureComponent<Props, ClockState> {
 
   get dateTimeFormat (): any {
     // https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat
-    const options = { hour: 'numeric', minute: 'numeric' }
+    const options: Intl.DateTimeFormatOptions = { hour: 'numeric', minute: 'numeric' }
     if (this.props.clockFormat === '24') {
       options['hourCycle'] = 'h23'
     } else if (this.props.clockFormat === '12') {

diff --git a/components/brave_new_tab_ui/components/default/widget/index.tsx b/components/brave_new_tab_ui/components/default/widget/index.tsx
@@ -98,7 +98,7 @@ const createWidget = <P extends object>(WrappedComponent: React.ComponentType<P>
             widgetMenuPersist={widgetMenuPersist}
             textDirection={textDirection}
             menuPosition={menuPosition}
-            hideWidget={hideWidget as HideWidgetFunction}
+            hideWidget={hideWidget}
             persistWidget={this.persistWidget}
             unpersistWidget={this.unpersistWidget}
             lightWidget={lightWidget}

diff --git a/components/brave_rewards/resources/ui/components/walletWrapper/index.tsx b/components/brave_rewards/resources/ui/components/walletWrapper/index.tsx
@@ -238,6 +238,9 @@ export default class WalletWrapper extends React.PureComponent<Props, State> {
       return
     }
 
+    // tslint:disable
+    const isWindows = window.navigator.platform === 'Win32'
+
     return (
       <GrantWrapper
         isPanel={true}
@@ -251,7 +254,7 @@ export default class WalletWrapper extends React.PureComponent<Props, State> {
           onSolution={this.onSolution.bind(this, grant.promotionId)}
           captchaImage={grant.captchaImage}
           hint={grant.hint}
-          isWindows={window.navigator.platform === 'Win32'}
+          isWindows={isWindows}
         />
       </GrantWrapper>
     )

diff --git a/components/brave_wallet_ui/components/desktop/top-tab-nav/index.tsx b/components/brave_wallet_ui/components/desktop/top-tab-nav/index.tsx
@@ -21,7 +21,7 @@ import { TopTabNavButton } from '../'
 
 export interface Props {
   tabList: TopTabNavObjectType[]
-  selectedTab: TopTabNavTypes | AddAccountNavTypes | AccountSettingsNavTypes
+  selectedTab?: TopTabNavTypes | AddAccountNavTypes | AccountSettingsNavTypes
   onSubmit: (id: TopTabNavTypes | AddAccountNavTypes | AccountSettingsNavTypes) => void
   onLockWallet?: () => void
   hasMoreButtons?: boolean

diff --git a/components/brave_wallet_ui/components/desktop/views/crypto/index.tsx b/components/brave_wallet_ui/components/desktop/views/crypto/index.tsx
@@ -25,8 +25,8 @@ import {
 } from '../../popup-modals/add-account-modal/hardware-wallet-connect/types'
 
 interface ParamsType {
-  category: TopTabNavTypes
-  id: string
+  category?: TopTabNavTypes
+  id?: string
 }
 
 export interface Props {
@@ -146,7 +146,7 @@ const CryptoView = (props: Props) => {
   React.useEffect(() => {
     if (category === 'portfolio') {
       if (id !== undefined) {
-        const asset = userVisibleTokensInfo.find((token) => token.symbol.toLowerCase() === id.toLowerCase())
+        const asset = userVisibleTokensInfo.find((token) => token.symbol.toLowerCase() === id?.toLowerCase())
         onSelectAsset(asset)
         setHideNav(true)
       } else {
@@ -159,7 +159,7 @@ const CryptoView = (props: Props) => {
         if (id === 'add-account') {
           onShowAddModal()
         } else {
-          const account = accounts.find((a) => a.address.toLowerCase() === id.toLowerCase())
+          const account = accounts.find((a) => a.address.toLowerCase() === id?.toLowerCase())
           setSelectedAccount(account)
           setHideNav(true)
         }

diff --git a/components/brave_wallet_ui/page/reducers/page_reducer.ts b/components/brave_wallet_ui/page/reducers/page_reducer.ts
@@ -73,9 +73,11 @@ reducer.on(Actions.doneViewingPrivateKey, (state: PageState) => {
 })
 
 reducer.on(Actions.walletSetupComplete, (state: PageState) => {
-  const newState = { ...state }
+  const newState: PageState = {
+    ...state,
+    setupStillInProgress: false
+  }
   delete newState.mnemonic
-  delete newState.setupStillInProgress
   return newState
 })
 

diff --git a/components/definitions/rewards.d.ts b/components/definitions/rewards.d.ts
@@ -253,7 +253,7 @@ declare namespace Rewards {
   export enum RewardsType {
     AUTO_CONTRIBUTE = 2,
     ONE_TIME_TIP = 8,
-    RECURRING_TIP = 21
+    RECURRING_TIP = 16
   }
 
   export interface ContributionSaved {
@@ -289,7 +289,8 @@ declare namespace Rewards {
     CONNECTED = 1,
     VERIFIED = 2,
     DISCONNECTED_NOT_VERIFIED = 3,
-    DISCONNECTED_VERIFIED = 4
+    DISCONNECTED_VERIFIED = 4,
+    PENDING = 5
   }
 
   export interface ExternalWallet {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -319,8 +319,8 @@
     "tslint-config-standard": "7.1.0",
     "tslint-react": "3.6.0",
     "typesafe-actions": "2.2.0",
-    "typescript": "3.9.9",
-    "typescript-plugin-styled-components": "1.4.4",
+    "typescript": "4.4.4",
+    "typescript-plugin-styled-components": "2.0.0",
     "url-loader": "0.6.2",
     "webpack": "4.46.0",
     "webpack-cli": "3.3.12"