diff --git a/packages/redux-remember/src/index.ts b/packages/redux-remember/src/index.ts index 8508b1e..eb27c04 100644 --- a/packages/redux-remember/src/index.ts +++ b/packages/redux-remember/src/index.ts @@ -37,7 +37,7 @@ const rememberReducer = { - let state = store.getState(); + let loadedData: Record = {}; let rehydrated = false; try { @@ -76,15 +76,12 @@ export const rehydrate = async ( ? loadAll : loadAllKeyed; - state = { - ...state, - ...await load({ - rememberedKeys, - driver, - prefix, - unserialize - }) - }; + loadedData = await load({ + rememberedKeys, + driver, + prefix, + unserialize + }); rehydrated = true; } catch (err) { @@ -92,6 +89,11 @@ export const rehydrate = async ( rehydrated = false; } + let state = { + ...store.getState(), + ...loadedData + }; + if (rehydrated) { try { state = await migrate(state);