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

[Update Account Settings] Preferences, About, Security #35672

Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
0f80d69
redesign preferences page
kosmydel Feb 2, 2024
d836214
Merge branch 'Expensify:main' into update-account-settings/preferences
kosmydel Feb 5, 2024
bd0d930
new about page design
kosmydel Feb 5, 2024
beebe04
add english copy
kosmydel Feb 6, 2024
1b2d2a7
add Spanish copy
kosmydel Feb 7, 2024
9571905
Merge branch 'main' into update-account-settings/preferences
kosmydel Feb 7, 2024
4397fc5
rename
kosmydel Feb 7, 2024
3124444
small fixes
kosmydel Feb 7, 2024
3a8cd2d
fix icon
kosmydel Feb 7, 2024
330fb72
fix illustration height
kosmydel Feb 8, 2024
9f2b8f8
Merge branch 'main' into update-account-settings/preferences
kosmydel Feb 8, 2024
1d0e5a9
fix statusbar color on mWeb iOS
kosmydel Feb 8, 2024
c74a873
fix lint
kosmydel Feb 8, 2024
715eacd
improve types
kosmydel Feb 8, 2024
426632c
fix workspace list empty state
kosmydel Feb 8, 2024
b6d1789
fix
kosmydel Feb 8, 2024
3601b3f
Merge remote-tracking branch 'origin-swm/update-account-settings/abou…
kosmydel Feb 8, 2024
3e44c6f
fix About page status bar
kosmydel Feb 8, 2024
3769321
Security page update
filip-solecki Feb 8, 2024
028d355
fix lint issues
kosmydel Feb 8, 2024
eab2a13
Adjust illustration background color logic
filip-solecki Feb 8, 2024
479203f
add missing icons
kosmydel Feb 8, 2024
56fd657
address review
kosmydel Feb 9, 2024
42d1233
Merge branch 'Expensify:main' into update-account-settings/preferences
kosmydel Feb 9, 2024
782d2ca
add comment
kosmydel Feb 9, 2024
8941626
Merge branch 'Expensify:main' into update-account-settings/preferences
kosmydel Feb 9, 2024
31e513d
Merge branch 'Expensify:main' into update-account-settings/preferences
kosmydel Feb 9, 2024
a33f3a8
remove shouldEnableMaxHeight
kosmydel Feb 9, 2024
5f13923
Merge branch 'main' into update-account-settings/preferences
kosmydel Feb 9, 2024
1743d97
Revert "address review"
kosmydel Feb 9, 2024
0375e27
Rename text styles
filip-solecki Feb 9, 2024
0993456
fix centering
kosmydel Feb 9, 2024
a9ef0cc
Merge branch 'main' into update-account-settings/preferences
filip-solecki Feb 9, 2024
f2ca240
Merge branch 'Expensify:main' into update-account-settings/preferences
kosmydel Feb 12, 2024
5e5bce0
attempt to fix the SignInPage-perf test
kosmydel Feb 12, 2024
4f30355
fix perf tests
kosmydel Feb 12, 2024
404b3c5
Merge branch 'main' into update-account-settings/preferences
filip-solecki Feb 13, 2024
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
Prev Previous commit
Next Next commit
Merge branch 'main' into update-account-settings/preferences
  • Loading branch information
kosmydel committed Feb 8, 2024
commit 9f2b8f817da8fe06897b1d8fb7b7854cc50ee55f
23 changes: 5 additions & 18 deletions src/pages/settings/Profile/ProfilePage.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import lodashGet from 'lodash/get';
import PropTypes from 'prop-types';
import React from 'react';
import React, {useEffect} from 'react';
import {ScrollView, View} from 'react-native';
import {withOnyx} from 'react-native-onyx';
import _ from 'underscore';
Expand All @@ -22,6 +22,7 @@ import compose from '@libs/compose';
import Navigation from '@libs/Navigation/Navigation';
import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
import * as UserUtils from '@libs/UserUtils';
import * as App from '@userActions/App';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
Expand Down Expand Up @@ -132,23 +133,9 @@ function ProfilePage(props) {
},
];

const privateOptions = [
{
description: props.translate('privatePersonalDetails.legalName'),
title: legalName,
pageRoute: ROUTES.SETTINGS_PERSONAL_DETAILS_LEGAL_NAME,
},
{
description: props.translate('common.dob'),
title: privateDetails.dob || '',
pageRoute: ROUTES.SETTINGS_PERSONAL_DETAILS_DATE_OF_BIRTH,
},
{
description: props.translate('privatePersonalDetails.address'),
title: PersonalDetailsUtils.getFormattedAddress(props.privatePersonalDetails),
pageRoute: ROUTES.SETTINGS_PERSONAL_DETAILS_ADDRESS,
},
];
useEffect(() => {
App.openProfile(props.currentUserPersonalDetails);
}, [props.currentUserPersonalDetails]);

const privateOptions = [
{
Expand Down
2 changes: 2 additions & 0 deletions src/styles/variables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ export default {
workspaceTypeIconWidth: 34,
sectionMargin: 16,
workspaceSectionMaxWidth: 680,
oldDotWireframeIconWidth: 263.38,
oldDotWireframeIconHeight: 143.28,
sectionIllustrationHeight: 220,
photoUploadPopoverWidth: 335,

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.