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

fix: infinite loading with invalid account route #21286

Merged
merged 1 commit into from
Jun 22, 2023
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
11 changes: 11 additions & 0 deletions src/libs/ValidationUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,16 @@ function isNumeric(value) {
return /^\d*$/.test(value);
}

/**
* Checks that the provided accountID is a number and bigger than 0.
*
* @param {Number} accountID
* @returns {Boolean}
*/
function isValidAccountRoute(accountID) {
return CONST.REGEX.NUMBER.test(accountID) && accountID > 0;
}

export {
meetsMinimumAgeRequirement,
meetsMaximumAgeRequirement,
Expand Down Expand Up @@ -481,4 +491,5 @@ export {
isValidLegalName,
doesContainReservedWord,
isNumeric,
isValidAccountRoute,
};
6 changes: 4 additions & 2 deletions src/pages/ProfilePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import BlockingView from '../components/BlockingViews/BlockingView';
import * as Illustrations from '../components/Icon/Illustrations';
import variables from '../styles/variables';
import ROUTES from '../ROUTES';
import * as ValidationUtils from '../libs/ValidationUtils';

const matchType = PropTypes.shape({
params: PropTypes.shape({
Expand Down Expand Up @@ -95,12 +96,13 @@ function ProfilePage(props) {

// eslint-disable-next-line rulesdir/prefer-early-return
useEffect(() => {
if (accountID > 0) {
if (ValidationUtils.isValidAccountRoute(accountID)) {
PersonalDetails.openPublicProfilePage(accountID);
}
}, [accountID]);

const details = lodashGet(props.personalDetails, accountID, {});
const details = lodashGet(props.personalDetails, accountID, {isLoading: ValidationUtils.isValidAccountRoute(accountID)});

const displayName = details.displayName ? details.displayName : props.translate('common.hidden');
const avatar = lodashGet(details, 'avatar', UserUtils.getDefaultAvatar());
const originalFileName = lodashGet(details, 'originalFileName', '');
Expand Down
13 changes: 13 additions & 0 deletions tests/unit/ValidationUtilsTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,17 @@ describe('ValidationUtils', () => {
expect(ValidationUtils.isValidWebsite('www.expensify😄.com')).toBe(false);
});
});

describe('ValidateAccountRoute', () => {
test('Valid account route', () => {
expect(ValidationUtils.isValidAccountRoute(123123)).toBe(true);
expect(ValidationUtils.isValidAccountRoute(5612)).toBe(true);
});

test('Invalid account route', () => {
expect(ValidationUtils.isValidAccountRoute(undefined)).toBe(false);
expect(ValidationUtils.isValidAccountRoute(0)).toBe(false);
expect(ValidationUtils.isValidAccountRoute('123aaa')).toBe(false);
});
});
});