diff --git a/packages/legacy/core/App/contexts/reducers/store.ts b/packages/legacy/core/App/contexts/reducers/store.ts index 9485e63ff..614243cca 100644 --- a/packages/legacy/core/App/contexts/reducers/store.ts +++ b/packages/legacy/core/App/contexts/reducers/store.ts @@ -15,8 +15,7 @@ import { generateRandomWalletName } from '../../utils/helpers' import { PersistentStorage } from '../../services/storage' enum StateDispatchAction { - STATE_DISPATCH = 'state/stateDispatch', - STATE_LOADED = 'state/stateLoaded', + STATE_DISPATCH = 'state/stateDispatch' } enum OnboardingDispatchAction { @@ -110,12 +109,9 @@ export interface ReducerAction { export const reducer = (state: S, action: ReducerAction): S => { switch (action.type) { - case StateDispatchAction.STATE_LOADED: { - return { ...state, stateLoaded: true } - } case StateDispatchAction.STATE_DISPATCH: { const newState: State = (action?.payload || []).pop() - return { ...state, ...newState } + return { ...state, ...newState, stateLoaded: true } } case PreferencesDispatchAction.ENABLE_DEVELOPER_MODE: { const choice = (action?.payload ?? []).pop() ?? false diff --git a/packages/legacy/core/App/localization/en/index.ts b/packages/legacy/core/App/localization/en/index.ts index 3e7d03fb5..d0d1f8097 100644 --- a/packages/legacy/core/App/localization/en/index.ts +++ b/packages/legacy/core/App/localization/en/index.ts @@ -839,7 +839,7 @@ const translation = { "CredentialReceived": "received a credential", "ProofRequestSent": "sent a proof request", "ProofPresentationReceived": "has sent you information", - "ProofRequestReceived": "received a proof request", + "ProofRequestReceived": "has sent you a proof request", "ProofRequestRejected": "rejected a proof request", "ProofRequestRejectReceived": "rejected a proof request", "ProofRequestSatisfied": "shared information", diff --git a/packages/legacy/core/App/localization/fr/index.ts b/packages/legacy/core/App/localization/fr/index.ts index 4fe919d42..cca603d21 100644 --- a/packages/legacy/core/App/localization/fr/index.ts +++ b/packages/legacy/core/App/localization/fr/index.ts @@ -816,7 +816,7 @@ const translation = { "CredentialReceived": "reçu une attestation", "ProofRequestSent": "envoyé une demande d'attestation", "ProofPresentationReceived": "vous a envoyé des informations", - "ProofRequestReceived": "reçu une demande d'attestation", + "ProofRequestReceived": "has sent you a proof request (FR)", "ProofRequestRejected": "rejeté une demande d'attestation", "ProofRequestRejectReceived": "a rejeté une demande d'attestation", "ProofRequestSatisfied": "informations partagées", diff --git a/packages/legacy/core/App/localization/pt-br/index.ts b/packages/legacy/core/App/localization/pt-br/index.ts index 1ae6946fb..d17156fe2 100644 --- a/packages/legacy/core/App/localization/pt-br/index.ts +++ b/packages/legacy/core/App/localization/pt-br/index.ts @@ -791,7 +791,7 @@ const translation = { "CredentialReceived": "recebeu uma credencial", "ProofRequestSent": "enviou uma solicitação de prova", "ProofPresentationReceived": "te enviou informações", - "ProofRequestReceived": "recebeu uma solicitação de prova", + "ProofRequestReceived": "has sent you a proof request (PT-BR)", "ProofRequestRejected": "rejeitou uma solicitação de prova", "ProofRequestRejectReceived": "rejeitou um pedido de prova", "ProofRequestSatisfied": "informações compartilhadas", diff --git a/packages/legacy/core/App/navigators/RootStack.tsx b/packages/legacy/core/App/navigators/RootStack.tsx index 2aaee95ac..4814e07a9 100644 --- a/packages/legacy/core/App/navigators/RootStack.tsx +++ b/packages/legacy/core/App/navigators/RootStack.tsx @@ -13,7 +13,6 @@ import { DeviceEventEmitter } from 'react-native' import IconButton, { ButtonLocation } from '../components/buttons/IconButton' import { EventTypes } from '../constants' import { TOKENS, useServices } from '../container-api' -import { DispatchAction } from '../contexts/reducers/store' import { useStore } from '../contexts/store' import { useTheme } from '../contexts/theme' import { useDeepLinks } from '../hooks/deep-links' @@ -67,9 +66,6 @@ const RootStack: React.FC = () => { useEffect(() => { loadState(dispatch) - .then(() => { - dispatch({ type: DispatchAction.STATE_LOADED }) - }) .catch((err: unknown) => { const error = new BifoldError(t('Error.Title1044'), t('Error.Message1044'), (err as Error).message, 1001) DeviceEventEmitter.emit(EventTypes.ERROR_ADDED, error) diff --git a/packages/legacy/core/App/utils/helpers.ts b/packages/legacy/core/App/utils/helpers.ts index e44e82a50..d3fa678d8 100644 --- a/packages/legacy/core/App/utils/helpers.ts +++ b/packages/legacy/core/App/utils/helpers.ts @@ -1200,7 +1200,7 @@ export function getProofEventRole(record: ProofExchangeRecord) { case ProofState.PresentationReceived: return Role.them case ProofState.RequestReceived: - return Role.me + return Role.them case ProofState.ProposalSent: case ProofState.PresentationSent: return Role.me