Remove personalDetails as part of personalDetails migration

src/components/ArchivedReportFooter.js

@@ -22,11 +22,11 @@ const propTypes = {
             /** The reason the report was closed */
             reason: PropTypes.string.isRequired,
 
-            /** (For accountMerged reason only), the email of the previous owner of this report. */
-            oldLogin: PropTypes.string,
+            /** (For accountMerged reason only), the accountID of the previous owner of this report. */
+            oldAccountID: PropTypes.number,
 
-            /** (For accountMerged reason only), the email of the account the previous owner was merged into */
-            newLogin: PropTypes.string,
+            /** (For accountMerged reason only), the accountID of the account the previous owner was merged into */
+            newAccountID: PropTypes.number,
         }).isRequired,
     }),
 

src/libs/migrations/PersonalDetailsByAccountID.js

@@ -225,6 +225,13 @@ export default function () {
                 }
             });
 
+            // The personalDetails object has been replaced by personalDetailsList
+            // So if we find an instance of personalDetails we will clear it out
+            if (oldPersonalDetails) {
+                Log.info('[Migrate Onyx] PersonalDetailsByAccountID migration: removing personalDetails');
+                onyxData[DEPRECATED_ONYX_KEYS.PERSONAL_DETAILS] = null;
+            }
+
             return Onyx.multiSet(onyxData);
         },
     );

tests/unit/MigrationTest.js

@@ -845,5 +845,30 @@ describe('Migrations', () => {
                         },
                     });
                 }));
+
+        it('Should succeed in removing the personalDetails object if found in Onyx', () =>
+            Onyx.multiSet({
+                [`${DEPRECATED_ONYX_KEYS.PERSONAL_DETAILS}`]: {
+                    'test1@account.com': {
+                        accountID: 100,
+                        login: 'test1@account.com',
+                    },
+                    'test2@account.com': {
+                        accountID: 101,
+                        login: 'test2@account.com',
+                    },
+                },
+            })
+                .then(PersonalDetailsByAccountID)
+                .then(() => {
+                    expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] PersonalDetailsByAccountID migration: removing personalDetails');
+                    const connectionID = Onyx.connect({
+                        key: DEPRECATED_ONYX_KEYS.PERSONAL_DETAILS,
+                        callback: (allPersonalDetails) => {
+                            Onyx.disconnect(connectionID);
+                            expect(allPersonalDetails).toBeNull();
+                        },
+                    });
+                }));
     });
 });