Stop using MY_PERSONAL_DETAILS and only use PERSONAL_DETAILS in Onyx

src/ONYXKEYS.js

@@ -46,9 +46,6 @@ export default {
     // Keeps track if there is modal currently visible or not
     MODAL: 'modal',
 
-    // Contains the personalDetails of the user as well as their timezone
-    MY_PERSONAL_DETAILS: 'myPersonalDetails',
-
     // Has information about the network status (offline/online)
     NETWORK: 'network',
 

src/components/IOUConfirmationList.js

@@ -16,6 +16,7 @@ import SettlementButton from './SettlementButton';
 import ROUTES from '../ROUTES';
 import networkPropTypes from './networkPropTypes';
 import {withNetwork} from './OnyxProvider';
+import personalDetailsPropType from '../pages/personalDetailsPropType';
 
 const propTypes = {
     /** Callback to inform parent modal of success */
@@ -65,18 +66,8 @@ const propTypes = {
 
     /* Onyx Props */
 
-    /** The personal details of the person who is logged in */
-    myPersonalDetails: PropTypes.shape({
-
-        /** Display name of the current user from their personal details */
-        displayName: PropTypes.string,
-
-        /** Avatar URL of the current user from their personal details */
-        avatar: PropTypes.string,
-
-        /** Primary login of the user */
-        login: PropTypes.string,
-    }),
+    /** Personal details of all the users, including current user */
+    personalDetails: PropTypes.objectOf(personalDetailsPropType),
 
     /** Holds data related to IOU view state, rather than the underlying IOU data. */
     iou: PropTypes.shape({
@@ -103,7 +94,7 @@ const defaultProps = {
     },
     onUpdateComment: null,
     comment: '',
-    myPersonalDetails: {},
+    personalDetails: {},
     iouType: CONST.IOU.IOU_TYPE.REQUEST,
 };
 
@@ -125,6 +116,8 @@ class IOUConfirmationList extends Component {
             value: props.hasMultipleParticipants ? CONST.IOU.IOU_TYPE.SPLIT : CONST.IOU.IOU_TYPE.REQUEST,
         }];
 
+        this.myPersonalDetails = _.findWhere(props.personalDetails, {isCurrentUser: true});
+
         this.state = {
             participants: formattedParticipants,
         };
@@ -190,7 +183,7 @@ class IOUConfirmationList extends Component {
             const formattedParticipants = _.union(formattedSelectedParticipants, formattedUnselectedParticipants);
 
             const formattedMyPersonalDetails = OptionsListUtils.getIOUConfirmationOptionsFromMyPersonalDetail(
-                this.props.myPersonalDetails,
+                this.myPersonalDetails,
                 this.props.numberFormat(this.calculateAmount(selectedParticipants, true) / 100, {
                     style: 'currency',
                     currency: this.props.iou.selectedCurrencyCode,
@@ -246,7 +239,7 @@ class IOUConfirmationList extends Component {
         }));
 
         splits.push({
-            email: OptionsListUtils.addSMSDomainIfPhoneNumber(this.props.myPersonalDetails.login),
+            email: OptionsListUtils.addSMSDomainIfPhoneNumber(this.myPersonalDetails.login),
 
             // The user is default and we should send in cents to API
             // USD is temporary and there must be support for other currencies in the future
@@ -266,7 +259,7 @@ class IOUConfirmationList extends Component {
         const selectedParticipants = this.getSelectedParticipants();
         return [
             ...selectedParticipants,
-            OptionsListUtils.getIOUConfirmationOptionsFromMyPersonalDetail(this.props.myPersonalDetails),
+            OptionsListUtils.getIOUConfirmationOptionsFromMyPersonalDetail(this.myPersonalDetails),
         ];
     }
 
@@ -398,8 +391,8 @@ export default compose(
     withNetwork(),
     withOnyx({
         iou: {key: ONYXKEYS.IOU},
-        myPersonalDetails: {
-            key: ONYXKEYS.MY_PERSONAL_DETAILS,
+        personalDetails: {
+            key: ONYXKEYS.PERSONAL_DETAILS,
         },
         session: {
             key: ONYXKEYS.SESSION,

src/libs/DateUtils.js

@@ -14,9 +14,10 @@ import * as CurrentDate from './actions/CurrentDate';
 
 let timezone = CONST.DEFAULT_TIME_ZONE;
 Onyx.connect({
-    key: ONYXKEYS.MY_PERSONAL_DETAILS,
+    key: ONYXKEYS.PERSONAL_DETAILS,
     callback: (val) => {
-        timezone = lodashGet(val, 'timezone', CONST.DEFAULT_TIME_ZONE);
+        const currentUser = _.findWhere(val, {isCurrentUser: true});
+        timezone = lodashGet(currentUser, 'timezone', CONST.DEFAULT_TIME_ZONE);
     },
 });
 

src/libs/Navigation/AppNavigator/AuthScreens.js

@@ -41,13 +41,14 @@ import networkPropTypes from '../../../components/networkPropTypes';
 import {withNetwork} from '../../../components/OnyxProvider';
 
 Onyx.connect({
-    key: ONYXKEYS.MY_PERSONAL_DETAILS,
+    key: ONYXKEYS.PERSONAL_DETAILS,
     callback: (val) => {
         if (!val) {
             return;
         }
 
-        const timezone = lodashGet(val, 'timezone', {});
+        const currentUser = _.findWhere(val, {isCurrentUser: true});
+        const timezone = lodashGet(currentUser, 'timezone', {});
         const currentTimezone = moment.tz.guess(true);
 
         // If the current timezone is different than the user's timezone, and their timezone is set to automatic

src/libs/actions/PersonalDetails.js

@@ -125,8 +125,6 @@ function fetchPersonalDetails() {
         returnValueList: 'personalDetailsList',
     })
         .then((data) => {
-            let myPersonalDetails = {};
-
             // If personalDetailsList does not have the current user ensure we initialize their details with an empty
             // object at least
             const personalDetailsList = _.isEmpty(data.personalDetailsList) ? {} : data.personalDetailsList;
@@ -135,16 +133,10 @@ function fetchPersonalDetails() {
             }
 
             const allPersonalDetails = formatPersonalDetails(personalDetailsList);
-            Onyx.merge(ONYXKEYS.PERSONAL_DETAILS, allPersonalDetails);
-
-            myPersonalDetails = allPersonalDetails[currentUserEmail];
 
-            // Add the first and last name to the current user's MY_PERSONAL_DETAILS key
-            myPersonalDetails.firstName = lodashGet(data.personalDetailsList, [currentUserEmail, 'firstName'], '');
-            myPersonalDetails.lastName = lodashGet(data.personalDetailsList, [currentUserEmail, 'lastName'], '');
-
-            // Set my personal details so they can be easily accessed and subscribed to on their own key
-            Onyx.merge(ONYXKEYS.MY_PERSONAL_DETAILS, myPersonalDetails);
+            // Flag which details belong to the currently logged in user for easy access before storing
+            allPersonalDetails[currentUserEmail].isCurrentUser = true;
+            Onyx.merge(ONYXKEYS.PERSONAL_DETAILS, allPersonalDetails);
         });
 }
 
@@ -262,8 +254,6 @@ function mergeLocalPersonalDetails(details) {
     // displayName is a generated field so we'll use the firstName and lastName + login to update it.
     mergedDetails.displayName = getDisplayName(currentUserEmail, mergedDetails);
 
-    // Update the associated Onyx keys
-    Onyx.merge(ONYXKEYS.MY_PERSONAL_DETAILS, mergedDetails);
     Onyx.merge(ONYXKEYS.PERSONAL_DETAILS, {[currentUserEmail]: mergedDetails});
 }
 
@@ -325,7 +315,7 @@ function fetchLocalCurrency() {
         })
         .then(getCurrencyList)
         .then(() => {
-            Onyx.merge(ONYXKEYS.MY_PERSONAL_DETAILS, {localCurrencyCode: currency});
+            Onyx.merge(ONYXKEYS.PERSONAL_DETAILS, {[currentUserEmail]: {localCurrencyCode: currency}});
         })
         .finally(() => {
             Onyx.merge(ONYXKEYS.IOU, {

src/libs/actions/Report.js

@@ -51,8 +51,8 @@ Onyx.connect({
 
 let myPersonalDetails;
 Onyx.connect({
-    key: ONYXKEYS.MY_PERSONAL_DETAILS,
-    callback: val => myPersonalDetails = val,
+    key: ONYXKEYS.PERSONAL_DETAILS,
+    callback: val => myPersonalDetails = _.findWhere(val, {isCurrentUser: true}),
 });
 
 const allReports = {};

src/pages/EnablePayments/AdditionalDetailsStep.js

@@ -62,8 +62,8 @@ const propTypes = {
     /** Stores the personal details typed by the user */
     walletAdditionalDetailsDraft: walletAdditionalDetailsDraftPropTypes,
 
-    /** The personal details of the person who is logged in */
-    myPersonalDetails: personalDetailsPropType.isRequired,
+    /** Personal details of all the users, including current user */
+    personalDetails: PropTypes.objectOf(personalDetailsPropType).isRequired,
 };
 
 const defaultProps = {
@@ -93,6 +93,7 @@ class AdditionalDetailsStep extends React.Component {
         super(props);
 
         this.activateWallet = this.activateWallet.bind(this);
+        this.myPersonalDetails = _.findWhere(props.personalDetails, {isCurrentUser: true});
 
         this.requiredFields = [
             'legalFirstName',
@@ -233,7 +234,7 @@ class AdditionalDetailsStep extends React.Component {
         const isErrorVisible = _.size(this.getErrors()) > 0
             || lodashGet(this.props, 'walletAdditionalDetails.additionalErrorMessage', '').length > 0;
         const shouldAskForFullSSN = this.props.walletAdditionalDetails.shouldAskForFullSSN;
-        const {firstName, lastName} = PersonalDetails.extractFirstAndLastNameFromAvailableDetails(this.props.myPersonalDetails);
+        const {firstName, lastName} = PersonalDetails.extractFirstAndLastNameFromAvailableDetails(this.myPersonalDetails);
 
         return (
             <ScreenWrapper>
@@ -370,8 +371,8 @@ export default compose(
             key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
             initWithStoredValues: false,
         },
-        myPersonalDetails: {
-            key: ONYXKEYS.MY_PERSONAL_DETAILS,
+        personalDetails: {
+            key: ONYXKEYS.PERSONAL_DETAILS,
         },
     }),
 )(AdditionalDetailsStep);

src/pages/RequestCallPage.js

@@ -38,8 +38,8 @@ import networkPropTypes from '../components/networkPropTypes';
 const propTypes = {
     ...withLocalizePropTypes,
 
-    /** The personal details of the person who is logged in */
-    myPersonalDetails: personalDetailsPropType.isRequired,
+    /** Personal details of all the users */
+    personalDetails: PropTypes.objectOf(personalDetailsPropType).isRequired,
 
     /** Login list for the user that is signed in */
     loginList: PropTypes.arrayOf(PropTypes.shape({
@@ -99,7 +99,8 @@ const defaultProps = {
 class RequestCallPage extends Component {
     constructor(props) {
         super(props);
-        const {firstName, lastName} = PersonalDetails.extractFirstAndLastNameFromAvailableDetails(props.myPersonalDetails);
+        const myPersonalDetails = _.findWhere(props.personalDetails, {isCurrentUser: true});
+        const {firstName, lastName} = PersonalDetails.extractFirstAndLastNameFromAvailableDetails(myPersonalDetails);
         this.state = {
             firstName,
             hasFirstNameError: false,
@@ -355,8 +356,8 @@ export default compose(
     withLocalize,
     withNetwork(),
     withOnyx({
-        myPersonalDetails: {
-            key: ONYXKEYS.MY_PERSONAL_DETAILS,
+        personalDetails: {
+            key: ONYXKEYS.PERSONAL_DETAILS,
         },
         loginList: {
             key: ONYXKEYS.LOGIN_LIST,

src/pages/home/report/ReportActionCompose.js

@@ -96,12 +96,6 @@ const propTypes = {
         expiresAt: PropTypes.string,
     }),
 
-    /** The personal details of the person who is logged in */
-    myPersonalDetails: PropTypes.shape({
-        /** Primary login of the user */
-        login: PropTypes.string,
-    }),
-
     ...windowDimensionsPropTypes,
     ...withLocalizePropTypes,
 };
@@ -113,7 +107,6 @@ const defaultProps = {
     reportActions: {},
     blockedFromConcierge: {},
     personalDetails: {},
-    myPersonalDetails: {},
 };
 
 class ReportActionCompose extends React.Component {
@@ -135,6 +128,7 @@ class ReportActionCompose extends React.Component {
         this.setTextInputRef = this.setTextInputRef.bind(this);
         this.getInputPlaceholder = this.getInputPlaceholder.bind(this);
         this.getIOUOptions = this.getIOUOptions.bind(this);
+        this.myPersonalDetails = _.findWhere(props.personalDetails, {isCurrentUser: true});
 
         this.state = {
             isFocused: this.shouldFocusInputOnScreenFocus,
@@ -263,7 +257,7 @@ class ReportActionCompose extends React.Component {
      * @returns {Array<object>}
      */
     getIOUOptions(reportParticipants) {
-        const participants = _.filter(reportParticipants, email => this.props.myPersonalDetails.login !== email);
+        const participants = _.filter(reportParticipants, email => this.myPersonalDetails.login !== email);
         const hasExcludedIOUEmails = lodashIntersection(reportParticipants, CONST.EXPENSIFY_EMAILS).length > 0;
         const hasMultipleParticipants = participants.length > 1;
         const iouOptions = [];
@@ -696,8 +690,5 @@ export default compose(
         blockedFromConcierge: {
             key: ONYXKEYS.NVP_BLOCKED_FROM_CONCIERGE,
         },
-        myPersonalDetails: {
-            key: ONYXKEYS.MY_PERSONAL_DETAILS,
-        },
     }),
 )(ReportActionCompose);

src/pages/home/sidebar/SidebarLinks.js

@@ -57,15 +57,6 @@ const propTypes = {
     /** List of users' personal details */
     personalDetails: PropTypes.objectOf(participantPropTypes),
 
-    /** The personal details of the person who is logged in */
-    myPersonalDetails: PropTypes.shape({
-        /** Display name of the current user from their personal details */
-        displayName: PropTypes.string,
-
-        /** Avatar URL of the current user from their personal details */
-        avatar: PropTypes.string,
-    }),
-
     /** Information about the network */
     network: networkPropTypes.isRequired,
 
@@ -91,9 +82,6 @@ const defaultProps = {
     reports: {},
     reportsWithDraft: {},
     personalDetails: {},
-    myPersonalDetails: {
-        avatar: ReportUtils.getDefaultAvatar(),
-    },
     currentlyViewedReportID: '',
     priorityMode: CONST.PRIORITY_MODE.DEFAULT,
     initialReportDataLoaded: false,
@@ -172,6 +160,13 @@ class SidebarLinks extends React.Component {
 
     constructor(props) {
         super(props);
+
+        // Get my details from the list of personal details and set default avatar if not already set
+        this.myPersonalDetails = _.findWhere(props.personalDetails, {isCurrentUser: true});
+        if (!_.has(this.myPersonalDetails, 'avatar') || _.isEmpty(this.myPersonalDetails.avatar)) {
+            this.myPersonalDetails.avatar = ReportUtils.getDefaultAvatar();
+        }
+
         this.state = {
             activeReport: {
                 reportID: props.currentlyViewedReportID,
@@ -287,7 +282,7 @@ class SidebarLinks extends React.Component {
                         onPress={this.props.onAvatarClick}
                     >
                         <AvatarWithIndicator
-                            source={this.props.myPersonalDetails.avatar}
+                            source={this.myPersonalDetails.avatar}
                             isActive={this.props.network && !this.props.network.isOffline}
                             isSyncing={this.props.network && !this.props.network.isOffline && this.props.isSyncingData}
                             tooltipText={this.props.translate('common.settings')}
@@ -333,9 +328,6 @@ export default compose(
         personalDetails: {
             key: ONYXKEYS.PERSONAL_DETAILS,
         },
-        myPersonalDetails: {
-            key: ONYXKEYS.MY_PERSONAL_DETAILS,
-        },
         currentlyViewedReportID: {
             key: ONYXKEYS.CURRENTLY_VIEWED_REPORTID,
         },