zed-io
diff --git a/‎package.json
+5-4 b/‎package.json
+5-4
diff --git a/‎src/account/reducer.test.ts
+3-1 b/‎src/account/reducer.test.ts
+3-1
diff --git a/‎src/account/reducer.ts
+2-2 b/‎src/account/reducer.ts
+2-2
diff --git a/‎src/alert/AlertBanner.test.tsx
+2-3 b/‎src/alert/AlertBanner.test.tsx
+2-3
diff --git a/‎src/alert/reducer.ts
+3-3 b/‎src/alert/reducer.ts
+3-3
diff --git a/‎src/app/reducers.ts
+1-1 b/‎src/app/reducers.ts
+1-1
diff --git a/‎src/dapps/slice.ts
+1-1 b/‎src/dapps/slice.ts
+1-1
diff --git a/‎src/escrow/reducer.ts
+6-3 b/‎src/escrow/reducer.ts
+6-3
diff --git a/‎src/exchange/reducer.ts
+1-1 b/‎src/exchange/reducer.ts
+1-1
diff --git a/‎src/fees/reducer.ts
+2-2 b/‎src/fees/reducer.ts
+2-2
diff --git a/‎src/fiatExchanges/quotes/FiatConnectQuote.ts
+1-1 b/‎src/fiatExchanges/quotes/FiatConnectQuote.ts
+1-1
diff --git a/‎src/fiatExchanges/quotes/NormalizedQuote.ts
+1-1 b/‎src/fiatExchanges/quotes/NormalizedQuote.ts
+1-1
diff --git a/‎src/fiatExchanges/reducer.ts
+6-3 b/‎src/fiatExchanges/reducer.ts
+6-3
diff --git a/‎src/home/reducers.test.ts
+17-3 b/‎src/home/reducers.test.ts
+17-3
diff --git a/‎src/home/reducers.ts
+8-2 b/‎src/home/reducers.ts
+8-2
diff --git a/‎src/i18n/slice.ts
+1-1 b/‎src/i18n/slice.ts
+1-1
diff --git a/‎src/identity/reducer.ts
+1-1 b/‎src/identity/reducer.ts
+1-1
diff --git a/‎src/import/reducer.ts
+2-2 b/‎src/import/reducer.ts
+2-2
diff --git a/‎src/jumpstart/slice.ts
+1-1 b/‎src/jumpstart/slice.ts
+1-1
diff --git a/‎src/keylessBackup/slice.ts
+2-2 b/‎src/keylessBackup/slice.ts
+2-2
diff --git a/‎src/localCurrency/reducer.ts
+1-1 b/‎src/localCurrency/reducer.ts
+1-1
diff --git a/‎src/networkInfo/reducer.ts
+2-2 b/‎src/networkInfo/reducer.ts
+2-2
diff --git a/‎src/nfts/slice.ts
+1-1 b/‎src/nfts/slice.ts
+1-1
diff --git a/‎src/positions/slice.ts
+1-1 b/‎src/positions/slice.ts
+1-1
@@ -104,7 +104,7 @@
     "@react-navigation/material-top-tabs": "^5.3.19",
     "@react-navigation/native": "^6.1.12",
     "@react-navigation/native-stack": "^6.9.20",
-    "@reduxjs/toolkit": "^1.9.7",
+    "@reduxjs/toolkit": "^2.2.1",
     "@segment/analytics-react-native": "^2.18.0",
     "@segment/analytics-react-native-plugin-adjust": "^0.7.0",
     "@segment/analytics-react-native-plugin-clevertap": "^1.1.0",
@@ -190,7 +190,7 @@
     "react-native-video": "^6.0.0-beta.3",
     "react-native-webview": "^13.8.1",
     "react-redux": "^7.2.9",
-    "redux": "^4.2.1",
+    "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
     "redux-persist-fs-storage": "^1.3.0",
     "redux-saga": "^1.3.0",
@@ -234,7 +234,7 @@
     "@types/react-native-video": "^5.0.15",
     "@types/react-redux": "^7.1.7",
     "@types/react-test-renderer": "^18.0.0",
-    "@types/redux-mock-store": "^1.0.0",
+    "@types/redux-mock-store": "^1.0.6",
     "@types/seedrandom": "^3.0.5",
     "@types/shelljs": "^0.8.11",
     "@types/utf8": "^2.1.6",
@@ -341,7 +341,8 @@
     "flat": "^5.0.2",
     "crypto-js": "^4.2.0",
     "browserify-sign": "^4.2.2",
-    "follow-redirects": "^1.15.5"
+    "follow-redirects": "^1.15.5",
+    "redux": "^5.0.0"
   },
   "detox": {
     "testRunner": {
 
@@ -1,5 +1,7 @@
-import { reducer, initialState } from 'src/account/reducer'
 import { Actions, ChooseCreateAccountAction } from 'src/account/actions'
+import { reducer } from 'src/account/reducer'
+
+const initialState = reducer(undefined, { type: 'INIT' } as any)
 
 describe('account reducer', () => {
   describe('CHOOSE_CREATE_ACCOUNT action', () => {
 
@@ -7,7 +7,7 @@ import { getRehydratePayload, REHYDRATE, RehydrateAction } from 'src/redux/persi
 import Logger from 'src/utils/Logger'
 import { Actions as Web3Actions, ActionTypes as Web3ActionTypes } from 'src/web3/actions'
 
-export interface State {
+interface State {
   name: string | null
   e164PhoneNumber: string | null
   pictureUri: string | null
@@ -73,7 +73,7 @@ export enum RecoveryPhraseInOnboardingStatus {
   Completed = 'Completed', // users who have clicked "I've saved it"
 }
 
-export const initialState: State = {
+const initialState: State = {
   name: null,
   e164PhoneNumber: null,
   pictureUri: null,
 
@@ -1,7 +1,6 @@
 import { fireEvent, render, within } from '@testing-library/react-native'
 import * as React from 'react'
 import { Provider } from 'react-redux'
-import { AnyAction } from 'redux'
 import { AlertTypes } from 'src/alert/actions'
 import AlertBanner from 'src/alert/AlertBanner'
 import { ErrorDisplayType } from 'src/alert/reducer'
@@ -83,7 +82,7 @@ describe('AlertBanner', () => {
           displayMethod: ErrorDisplayType.BANNER,
           message: 'My message',
           dismissAfter: 0,
-          action: { type: 'MY_ACTION' } as AnyAction,
+          action: { type: 'MY_ACTION' },
         },
       })
       const { getByTestId } = render(
@@ -105,7 +104,7 @@ describe('AlertBanner', () => {
           displayMethod: ErrorDisplayType.BANNER,
           message: 'My precious toast',
           buttonMessage: 'Some button label',
-          action: { type: 'MY_ACTION' } as AnyAction,
+          action: { type: 'MY_ACTION' },
         },
       })
       const { getByText, queryByTestId } = render(
 
@@ -1,4 +1,4 @@
-import { AnyAction } from 'redux'
+import { Action } from '@reduxjs/toolkit'
 import { Actions, ActionTypes, AlertTypes } from 'src/alert/actions'
 import { ErrorMessages } from 'src/app/ErrorMessages'
 import { ActionTypes as ExchangeActionTypes } from 'src/exchange/actions'
@@ -15,12 +15,12 @@ export interface Alert {
   message: string
   dismissAfter?: number | null
   buttonMessage?: string | null
-  action?: AnyAction | null
+  action?: Action | null
   title?: string | null
   underlyingError?: ErrorMessages | null
 }
 
-export type State = Alert | null
+type State = Alert | null
 
 const initialState = null
 
 
@@ -9,7 +9,7 @@ import { getRehydratePayload, REHYDRATE, RehydrateAction } from 'src/redux/persi
 
 const PERSISTED_DEEP_LINKS = ['https://valoraapp.com/share', 'celo://wallet/jumpstart']
 
-export interface State {
+interface State {
   loggedIn: boolean
   numberVerified: boolean // decentrally verified
   phoneNumberVerified: boolean // centrally verified
 
@@ -4,7 +4,7 @@ import { ActiveDapp, Dapp, DappCategory } from 'src/dapps/types'
 import { REMOTE_CONFIG_VALUES_DEFAULTS } from 'src/firebase/remoteConfigValuesDefaults'
 import { getRehydratePayload, REHYDRATE, RehydrateAction } from 'src/redux/persist-helper'
 
-export interface State {
+interface State {
   dappsWebViewEnabled: boolean
   activeDapp: ActiveDapp | null
   maxNumRecentDapps: number
 
@@ -2,17 +2,20 @@ import { createSelector } from 'reselect'
 import { Actions, ActionTypes, EscrowedPayment } from 'src/escrow/actions'
 import { RootState } from 'src/redux/reducers'
 
-export interface State {
+interface State {
   isReclaiming: boolean
   sentEscrowedPayments: EscrowedPayment[]
 }
 
-export const initialState = {
+const initialState = {
   isReclaiming: false,
   sentEscrowedPayments: [],
 }
 
-export const escrowReducer = (state: State | undefined = initialState, action: ActionTypes) => {
+export const escrowReducer = (
+  state: State | undefined = initialState,
+  action: ActionTypes
+): State => {
   switch (action.type) {
     case Actions.STORE_SENT_PAYMENTS:
       return {
 
@@ -14,7 +14,7 @@ export interface ExchangeRate {
 
 export type ExchangeRates = Record<Currency, Record<Currency, string>>
 
-export interface State {
+interface State {
   history: {
     // TODO this should be remove once we have aggregation on
     // blockchain api side
 
@@ -23,11 +23,11 @@ export interface FeeEstimates {
   }
 }
 
-export interface State {
+interface State {
   estimates: FeeEstimates
 }
 
-export const initialState: State = {
+const initialState: State = {
   estimates: {},
 }
 
 
@@ -7,7 +7,7 @@ import {
   QuoteResponseKycSchema,
 } from '@fiatconnect/fiatconnect-types'
 import BigNumber from 'bignumber.js'
-import { Dispatch } from 'redux'
+import { Dispatch } from '@reduxjs/toolkit'
 import { FiatConnectProviderInfo, FiatConnectQuoteSuccess } from 'src/fiatconnect'
 import { selectFiatConnectQuote } from 'src/fiatconnect/slice'
 import {
 
@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js'
-import { Dispatch } from 'redux'
+import { Dispatch } from '@reduxjs/toolkit'
 import { FiatExchangeEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import { SettlementEstimation } from 'src/fiatExchanges/quotes/constants'
 
@@ -20,17 +20,20 @@ interface TxHashToDisplayInfo {
   [txHash: string]: ProviderFeedInfo | undefined
 }
 
-export interface State {
+interface State {
   txHashToProvider: TxHashToDisplayInfo
   providerLogos: ProviderLogos
 }
 
-export const initialState = {
+const initialState = {
   txHashToProvider: {},
   providerLogos: {},
 }
 
-export const reducer = (state: State = initialState, action: ActionTypes | RehydrateAction) => {
+export const reducer = (
+  state: State = initialState,
+  action: ActionTypes | RehydrateAction
+): State => {
   switch (action.type) {
     case REHYDRATE: {
       return {
 
@@ -4,7 +4,12 @@ import {
   cleverTapInboxMessagesReceived,
   nftCelebrationDisplayed,
 } from 'src/home/actions'
-import { DEFAULT_PRIORITY, initialState, homeReducer as reducer } from 'src/home/reducers'
+import {
+  DEFAULT_PRIORITY,
+  Notification,
+  initialState,
+  homeReducer as reducer,
+} from 'src/home/reducers'
 import { NetworkId } from 'src/transactions/types'
 import { mockCleverTapInboxMessage, mockContractAddress } from 'test/values'
 
@@ -90,7 +95,7 @@ describe('home reducer', () => {
         notifications: {
           ...updatedState.notifications,
           notification1: {
-            ...updatedState.notifications.notification1,
+            ...(updatedState.notifications.notification1 as Notification),
             dismissed: true,
           },
         },
@@ -172,9 +177,18 @@ describe('home reducer', () => {
   })
 
   it('should mark nftCelebration as displayed', () => {
-    const updatedState = reducer(undefined, nftCelebrationDisplayed())
+    const initialState = reducer(
+      undefined,
+      celebratedNftFound({
+        networkId: NetworkId['celo-alfajores'],
+        contractAddress: mockContractAddress,
+      })
+    )
+    const updatedState = reducer(initialState, nftCelebrationDisplayed())
 
     expect(updatedState.nftCelebration).toEqual({
+      networkId: NetworkId['celo-alfajores'],
+      contractAddress: mockContractAddress,
       displayed: true,
     })
   })
 
@@ -30,7 +30,7 @@ export interface IdToNotification {
   [id: string]: Notification | undefined
 }
 
-export interface State {
+interface State {
   loading: boolean
   notifications: IdToNotification
   cleverTapInboxMessages: CleverTapInboxMessage[]
@@ -50,7 +50,10 @@ export const initialState = {
   nftCelebration: null,
 }
 
-export const homeReducer = (state: State = initialState, action: ActionTypes | RehydrateAction) => {
+export const homeReducer = (
+  state: State = initialState,
+  action: ActionTypes | RehydrateAction
+): State => {
   switch (action.type) {
     case REHYDRATE: {
       // Ignore some persisted properties
@@ -127,6 +130,9 @@ export const homeReducer = (state: State = initialState, action: ActionTypes | R
         },
       }
     case Actions.NFT_CELEBRATION_DISPLAYED:
+      if (!state.nftCelebration) {
+        return state
+      }
       return {
         ...state,
         nftCelebration: {
 
@@ -3,7 +3,7 @@ import { Actions as AppActions, UpdateConfigValuesAction } from 'src/app/actions
 import { REMOTE_CONFIG_VALUES_DEFAULTS } from 'src/firebase/remoteConfigValuesDefaults'
 import { getRehydratePayload, REHYDRATE, RehydrateAction } from 'src/redux/persist-helper'
 
-export interface State {
+interface State {
   language: string | null
   allowOtaTranslations: boolean
   otaTranslationsLastUpdate: number
 
@@ -70,7 +70,7 @@ export interface AddressToVerificationStatus {
   [address: string]: boolean | undefined
 }
 
-export interface State {
+interface State {
   hasSeenVerificationNux: boolean
   addressToE164Number: AddressToE164NumberType
   // Note: Do not access values in this directly, use the `getAddressFromPhoneNumber` helper in contactMapping
 
@@ -1,14 +1,14 @@
 import { Actions, ActionTypes } from 'src/import/actions'
 
-export interface State {
+interface State {
   isImportingWallet: boolean
 }
 
 const initialState = {
   isImportingWallet: false,
 }
 
-export const reducer = (state: State | undefined = initialState, action: ActionTypes) => {
+export const reducer = (state: State | undefined = initialState, action: ActionTypes): State => {
   switch (action.type) {
     case Actions.IMPORT_BACKUP_PHRASE:
       return {
 
@@ -1,6 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit'
 
-export interface State {
+interface State {
   claimStatus: 'idle' | 'loading' | 'error'
 }
 
 
@@ -5,7 +5,7 @@ import {
   KeylessBackupStatus,
 } from 'src/keylessBackup/types'
 
-export interface State {
+interface State {
   googleIdToken: string | null
   valoraKeyshare: string | null
   torusKeyshare: string | null
@@ -14,7 +14,7 @@ export interface State {
   showDeleteBackupError: boolean
 }
 
-export const initialState: State = {
+const initialState: State = {
   googleIdToken: null,
   valoraKeyshare: null,
   torusKeyshare: null,
 
@@ -2,7 +2,7 @@ import { Actions, ActionTypes } from 'src/localCurrency/actions'
 import { LocalCurrencyCode } from 'src/localCurrency/consts'
 import { getRehydratePayload, REHYDRATE, RehydrateAction } from 'src/redux/persist-helper'
 
-export interface State {
+interface State {
   isLoading: boolean
   error?: boolean
   preferredCurrencyCode?: LocalCurrencyCode
 
@@ -1,8 +1,8 @@
 import { REHYDRATE, RehydrateAction } from 'redux-persist'
-import { Actions, ActionTypes } from 'src/networkInfo/actions'
+import { ActionTypes, Actions } from 'src/networkInfo/actions'
 import { UserLocationData } from 'src/networkInfo/saga'
 
-export interface State {
+interface State {
   connected: boolean // True if the phone thinks it has a data connection (cellular/Wi-Fi), false otherwise.
   rehydrated: boolean
   userLocationData: UserLocationData
 
@@ -9,7 +9,7 @@ export interface FetchNftsFailedAction {
   error: string
 }
 
-export type State = {
+type State = {
   nftsLoading: boolean
   nftsError: string | null
   nfts: NftWithNetworkId[]
 
@@ -18,7 +18,7 @@ export type TriggeredShortcuts = Record<
   }
 >
 
-export interface State {
+interface State {
   positions: Position[]
   status: Status
   shortcuts: Shortcut[]
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,11 @@ export interface FeeEstimates {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`-export interface State {`
	`26`	`+interface State {`
`27`	`27`	`estimates: FeeEstimates`
`28`	`28`	`}`
`29`	`29`
`30`		`-export const initialState: State = {`
	`30`	`+const initialState: State = {`
`31`	`31`	`estimates: {},`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ export interface AddressToVerificationStatus {`
`70`	`70`	`[address: string]: boolean \| undefined`
`71`	`71`	`}`
`72`	`72`
`73`		`-export interface State {`
	`73`	`+interface State {`
`74`	`74`	`hasSeenVerificationNux: boolean`
`75`	`75`	`addressToE164Number: AddressToE164NumberType`
`76`	`76`	// Note: Do not access values in this directly, use the `getAddressFromPhoneNumber` helper in contactMapping
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`import { Actions, ActionTypes } from 'src/import/actions'`
`2`	`2`
`3`		`-export interface State {`
	`3`	`+interface State {`
`4`	`4`	`isImportingWallet: boolean`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`const initialState = {`
`8`	`8`	`isImportingWallet: false,`
`9`	`9`	`}`
`10`	`10`
`11`		`-export const reducer = (state: State \| undefined = initialState, action: ActionTypes) => {`
	`11`	`+export const reducer = (state: State \| undefined = initialState, action: ActionTypes): State => {`
`12`	`12`	`switch (action.type) {`
`13`	`13`	`case Actions.IMPORT_BACKUP_PHRASE:`
`14`	`14`	`return {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { createSlice } from '@reduxjs/toolkit'`
`2`	`2`
`3`		`-export interface State {`
	`3`	`+interface State {`
`4`	`4`	`claimStatus: 'idle' \| 'loading' \| 'error'`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export interface FetchNftsFailedAction {`
`9`	`9`	`error: string`
`10`	`10`	`}`
`11`	`11`
`12`		`-export type State = {`
	`12`	`+type State = {`
`13`	`13`	`nftsLoading: boolean`
`14`	`14`	`nftsError: string \| null`
`15`	`15`	`nfts: NftWithNetworkId[]`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export type TriggeredShortcuts = Record<`
`18`	`18`	`}`
`19`	`19`	`>`
`20`	`20`
`21`		`-export interface State {`
	`21`	`+interface State {`
`22`	`22`	`positions: Position[]`
`23`	`23`	`status: Status`
`24`	`24`	`shortcuts: Shortcut[]`