Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename profile page to details page #1931

Merged
merged 3 commits into from
Mar 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/ROUTES.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default {
SEARCH: 'search',
SIGNIN: 'signin',
SET_PASSWORD_WITH_VALIDATE_CODE: 'setpassword/:validateCode',
PROFILE: 'profile',
PROFILE_WITH_LOGIN: 'profile/:login',
getProfileRoute: login => `profile/${login}`,
DETAILS: 'details',
DETAILS_WITH_LOGIN: 'details/:login',
getDetailsRoute: login => `details/${login}`,
};
6 changes: 3 additions & 3 deletions src/libs/Navigation/AppNavigator/AuthScreens.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import MainDrawerNavigator from './MainDrawerNavigator';
import {
IOUBillStackNavigator,
IOURequestModalStackNavigator,
ProfileModalStackNavigator,
DetailsModalStackNavigator,
SearchModalStackNavigator,
NewGroupModalStackNavigator,
NewChatModalStackNavigator,
Expand Down Expand Up @@ -158,9 +158,9 @@ class AuthScreens extends React.Component {
component={SearchModalStackNavigator}
/>
<RootStack.Screen
name="Profile"
name="Details"
options={modalScreenOptions}
component={ProfileModalStackNavigator}
component={DetailsModalStackNavigator}
/>
<RootStack.Screen
name="IOU_Request"
Expand Down
22 changes: 11 additions & 11 deletions src/libs/Navigation/AppNavigator/ModalStackNavigators.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import {
NewChatModalStack,
NewGroupModalStack,
SearchModalStack,
ProfileModalStack,
DetailsModalStack,
IOURequestModalStack,
IOUBillModalStack,
} from './ModalStacks';
import NewChatPage from '../../../pages/NewChatPage';
import NewGroupPage from '../../../pages/NewGroupPage';
import SearchPage from '../../../pages/SearchPage';
import ProfilePage from '../../../pages/ProfilePage';
import DetailsPage from '../../../pages/DetailsPage';
import IOURequestPage from '../../../pages/iou/IOURequestPage';
import IOUBillPage from '../../../pages/iou/IOUBillPage';
import SettingsInitialPage from '../../../pages/settings/InitialPage';
Expand Down Expand Up @@ -58,19 +58,19 @@ const IOURequestModalStackNavigator = () => (
</IOURequestModalStack.Navigator>
);

const ProfileModalStackNavigator = () => (
<ProfileModalStack.Navigator
path={ROUTES.PROFILE}
const DetailsModalStackNavigator = () => (
<DetailsModalStack.Navigator
path={ROUTES.DETAILS}
>
<ProfileModalStack.Screen
name="Profile_Root"
component={ProfilePage}
<DetailsModalStack.Screen
name="Details_Root"
component={DetailsPage}
options={{
...defaultSubRouteOptions,
title: 'Profile',
title: 'Details',
}}
/>
</ProfileModalStack.Navigator>
</DetailsModalStack.Navigator>
);

const SearchModalStackNavigator = () => (
Expand Down Expand Up @@ -168,7 +168,7 @@ const SettingsModalStackNavigator = () => (
export {
IOUBillStackNavigator,
IOURequestModalStackNavigator,
ProfileModalStackNavigator,
DetailsModalStackNavigator,
SearchModalStackNavigator,
NewGroupModalStackNavigator,
NewChatModalStackNavigator,
Expand Down
4 changes: 2 additions & 2 deletions src/libs/Navigation/AppNavigator/ModalStacks/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const SettingsModalStack = createCustomModalStackNavigator();
const NewChatModalStack = createCustomModalStackNavigator();
const NewGroupModalStack = createCustomModalStackNavigator();
const SearchModalStack = createCustomModalStackNavigator();
const ProfileModalStack = createCustomModalStackNavigator();
const DetailsModalStack = createCustomModalStackNavigator();
const IOURequestModalStack = createCustomModalStackNavigator();
const IOUBillModalStack = createCustomModalStackNavigator();

Expand All @@ -14,7 +14,7 @@ export {
NewChatModalStack,
NewGroupModalStack,
SearchModalStack,
ProfileModalStack,
DetailsModalStack,
IOURequestModalStack,
IOUBillModalStack,
};
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const SettingsModalStack = shouldUseCustomModalStack ? createCustomModalStackNav
const NewChatModalStack = shouldUseCustomModalStack ? createCustomModalStackNavigator() : createStackNavigator();
const NewGroupModalStack = shouldUseCustomModalStack ? createCustomModalStackNavigator() : createStackNavigator();
const SearchModalStack = shouldUseCustomModalStack ? createCustomModalStackNavigator() : createStackNavigator();
const ProfileModalStack = shouldUseCustomModalStack ? createCustomModalStackNavigator() : createStackNavigator();
const DetailsModalStack = shouldUseCustomModalStack ? createCustomModalStackNavigator() : createStackNavigator();
const IOURequestModalStack = shouldUseCustomModalStack ? createCustomModalStackNavigator() : createStackNavigator();
const IOUBillModalStack = shouldUseCustomModalStack ? createCustomModalStackNavigator() : createStackNavigator();

Expand All @@ -20,7 +20,7 @@ export {
NewChatModalStack,
NewGroupModalStack,
SearchModalStack,
ProfileModalStack,
DetailsModalStack,
IOURequestModalStack,
IOUBillModalStack,
};
6 changes: 3 additions & 3 deletions src/libs/Navigation/linkingConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ export default {
Search_Root: '',
},
},
Profile: {
initialRouteName: 'Profile_Root',
Details: {
initialRouteName: 'Details_Root',
screens: {
Profile_Root: ROUTES.PROFILE_WITH_LOGIN,
Details_Root: ROUTES.DETAILS_WITH_LOGIN,
},
},
IOU_Request: {
Expand Down
48 changes: 24 additions & 24 deletions src/pages/ProfilePage.js → src/pages/DetailsPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const personalDetailsType = PropTypes.shape({

const matchType = PropTypes.shape({
params: PropTypes.shape({
// login passed via route /profile/:login
// login passed via route /details/:login
login: PropTypes.string,
}),
});
Expand All @@ -49,8 +49,8 @@ const propTypes = {
route: matchType.isRequired,
};

const ProfilePage = ({personalDetails, route}) => {
const profileDetails = personalDetails[route.params.login];
const DetailsPage = ({personalDetails, route}) => {
const details = personalDetails[route.params.login];
return (
<ScreenWrapper>
<HeaderWithCloseButton
Expand All @@ -60,56 +60,56 @@ const ProfilePage = ({personalDetails, route}) => {
<View
pointerEvents="box-none"
style={[
styles.profilePageContainer,
styles.detailsPageContainer,
]}
>
{profileDetails ? (
{details ? (
<View>
<View style={styles.pageWrapper}>
<View
style={[styles.avatarLarge, styles.mb3]}
>
<Avatar
style={[styles.avatarLarge]}
source={profileDetails.avatar}
source={details.avatar}
/>
</View>
<Text style={[styles.displayName, styles.mt1, styles.mb6]} numberOfLines={1}>
{profileDetails.displayName
? profileDetails.displayName
{details.displayName
? details.displayName
: null}
</Text>
{profileDetails.login ? (
<View style={[styles.mb6, styles.profilePageSectionContainer]}>
{details.login ? (
<View style={[styles.mb6, styles.detailsPageSectionContainer]}>
<Text style={[styles.formLabel, styles.mb2]} numberOfLines={1}>
{Str.isSMSLogin(profileDetails.login) ? 'Phone Number' : 'Email'}
{Str.isSMSLogin(details.login) ? 'Phone Number' : 'Email'}
</Text>
<Text style={[styles.textP]} numberOfLines={1}>
{Str.isSMSLogin(profileDetails.login)
? Str.removeSMSDomain(profileDetails.login)
: profileDetails.login}
{Str.isSMSLogin(details.login)
? Str.removeSMSDomain(details.login)
: details.login}
</Text>
</View>
) : null}
{profileDetails.pronouns ? (
<View style={[styles.mb6, styles.profilePageSectionContainer]}>
{details.pronouns ? (
<View style={[styles.mb6, styles.detailsPageSectionContainer]}>
<Text style={[styles.formLabel, styles.mb2]} numberOfLines={1}>
Preferred Pronouns
</Text>
<Text style={[styles.textP]} numberOfLines={1}>
{profileDetails.pronouns}
{details.pronouns}
</Text>
</View>
) : null}
{profileDetails.timezone ? (
<View style={[styles.mb6, styles.profilePageSectionContainer]}>
{details.timezone ? (
<View style={[styles.mb6, styles.detailsPageSectionContainer]}>
<Text style={[styles.formLabel, styles.mb2]} numberOfLines={1}>
Local Time
</Text>
<Text style={[styles.textP]} numberOfLines={1}>
{moment().tz(profileDetails.timezone.selected).format('LT')}
{moment().tz(details.timezone.selected).format('LT')}
{' '}
{moment().tz(profileDetails.timezone.selected).zoneAbbr()}
{moment().tz(details.timezone.selected).zoneAbbr()}
</Text>
</View>
) : null}
Expand All @@ -121,11 +121,11 @@ const ProfilePage = ({personalDetails, route}) => {
);
};

ProfilePage.propTypes = propTypes;
ProfilePage.displayName = 'ProfilePage';
DetailsPage.propTypes = propTypes;
DetailsPage.displayName = 'DetailsPage';

export default withOnyx({
personalDetails: {
key: ONYXKEYS.PERSONAL_DETAILS,
},
})(ProfilePage);
})(DetailsPage);
2 changes: 1 addition & 1 deletion src/pages/home/HeaderView.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const HeaderView = (props) => {
<Pressable
onPress={() => {
if (participants.length === 1) {
Navigation.navigate(ROUTES.getProfileRoute(participants[0]));
Navigation.navigate(ROUTES.getDetailsRoute(participants[0]));
}
}}
style={[styles.flexRow, styles.alignItemsCenter]}
Expand Down
6 changes: 3 additions & 3 deletions src/styles/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -1089,17 +1089,17 @@ const styles = {
opacity: 0,
},

profilePageContainer: {
detailsPageContainer: {
justifyContent: 'space-between',
width: '100%',
flex: 1,
},

profilePageSectionContainer: {
detailsPageSectionContainer: {
alignSelf: 'flex-start',
},

profilePageSectionVersion: {
detailsPageSectionVersion: {
alignSelf: 'center',
color: themeColors.textSupporting,
fontSize: variables.fontSizeSmall,
Expand Down