Migrate NVPs to their new keys #37556
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| import after from 'lodash/after'; | ||
| import Onyx from 'react-native-onyx'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
|
|
||
| // These are the oldKeyName: newKeyName of the NVPs we can migrate without any processing | ||
| const migrations = { | ||
This comment was marked as resolved.
Sorry, something went wrong. |
||
| // eslint-disable-next-line @typescript-eslint/naming-convention | ||
| nvp_lastPaymentMethod: ONYXKEYS.NVP_LAST_PAYMENT_METHOD, | ||
| isFirstTimeNewExpensifyUser: ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER, | ||
| preferredLocale: ONYXKEYS.NVP_PREFERRED_LOCALE, | ||
| preferredEmojiSkinTone: ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE, | ||
| frequentlyUsedEmojis: ONYXKEYS.FREQUENTLY_USED_EMOJIS, | ||
| // eslint-disable-next-line @typescript-eslint/naming-convention | ||
| private_blockedFromConcierge: ONYXKEYS.NVP_BLOCKED_FROM_CONCIERGE, | ||
| // eslint-disable-next-line @typescript-eslint/naming-convention | ||
| private_pushNotificationID: ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID, | ||
| tryFocusMode: ONYXKEYS.NVP_TRY_FOCUS_MODE, | ||
| introSelected: ONYXKEYS.NVP_INTRO_SELECTED, | ||
| hasDismissedIdlePanel: ONYXKEYS.NVP_HAS_DISMISSED_IDLE_PANEL, | ||
| }; | ||
|
|
||
| // This migration changes the keys of all the NVP related keys so that they are standardized | ||
| export default function () { | ||
| return new Promise<void>((resolve) => { | ||
| // Resolve the migration when all the keys have been migrated. The number of keys is the size of the `migrations` object in addition to the ACCOUNT and OLD_POLICY_RECENTLY_USED_TAGS keys (which is why there is a +2). | ||
| const resolveWhenDone = after(Object.entries(migrations).length + 2, () => resolve()); | ||
|
|
||
| for (const [oldKey, newKey] of Object.entries(migrations)) { | ||
| const connectionID = Onyx.connect({ | ||
| // @ts-expect-error oldKey is a variable | ||
| key: oldKey, | ||
| callback: (value) => { | ||
| Onyx.disconnect(connectionID); | ||
| if (value === null) { | ||
| resolveWhenDone(); | ||
| return; | ||
| } | ||
| // @ts-expect-error These keys are variables, so we can't check the type | ||
| Onyx.multiSet({ | ||
| [newKey]: value, | ||
| [oldKey]: null, | ||
| }).then(resolveWhenDone); | ||
| }, | ||
| }); | ||
| } | ||
| const connectionIDAccount = Onyx.connect({ | ||
| key: ONYXKEYS.ACCOUNT, | ||
| callback: (value) => { | ||
| Onyx.disconnect(connectionIDAccount); | ||
| // @ts-expect-error we are removing this property, so it is not in the type anymore | ||
| if (!value?.activePolicyID) { | ||
| resolveWhenDone(); | ||
| return; | ||
| } | ||
| // @ts-expect-error we are removing this property, so it is not in the type anymore | ||
| const activePolicyID = value.activePolicyID; | ||
| const newValue = {...value}; | ||
| // @ts-expect-error we are removing this property, so it is not in the type anymore | ||
| delete newValue.activePolicyID; | ||
| Onyx.multiSet({ | ||
| [ONYXKEYS.NVP_ACTIVE_POLICY_ID]: activePolicyID, | ||
| [ONYXKEYS.ACCOUNT]: newValue, | ||
| }).then(resolveWhenDone); | ||
| }, | ||
| }); | ||
| const connectionIDRecentlyUsedTags = Onyx.connect({ | ||
| key: ONYXKEYS.COLLECTION.OLD_POLICY_RECENTLY_USED_TAGS, | ||
| waitForCollectionCallback: true, | ||
| callback: (value) => { | ||
| Onyx.disconnect(connectionIDRecentlyUsedTags); | ||
| if (!value) { | ||
This comment was marked as resolved.
Sorry, something went wrong. |
||
| resolveWhenDone(); | ||
| return; | ||
| } | ||
| const newValue = {}; | ||
| for (const key of Object.keys(value)) { | ||
| // @ts-expect-error We have no fixed types here | ||
| newValue[`nvp_${key}`] = value[key]; | ||
| // @ts-expect-error We have no fixed types here | ||
| newValue[key] = null; | ||
| } | ||
| Onyx.multiSet(newValue).then(resolveWhenDone); | ||
| }, | ||
| }); | ||
| }); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this is causing regression. Engagement modal doesn't show after signup
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Screen.Recording.2024-03-14.at.10.13.27.pm.mov
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great catch! I was missing renaming this constant in the backend. Sending a PR now but it needs to go out to prod before you can re-check.
Was this the only bug you found? Can you check the rest of things to see if you find anything else broken please?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No issues found on any other nvp keys. But still going to retest
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wait a second, going to push a change...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done