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.

Sign up for GitHub

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

Jump to bottom

Fix crash from AvatarWithIndicator error checking methods #10652

Merged
merged 4 commits into from
Aug 29, 2022
Merged

Fix crash from AvatarWithIndicator error checking methods #10652

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66c3c60
Guard against null param in util methods
neil-marcellini Aug 29, 2022
3d2e16d
Revert "Guard against null param in util methods"
neil-marcellini Aug 29, 2022
d4b9d07
Remove null policies before checking for errors
neil-marcellini Aug 29, 2022
c235091
Remove null with filter and clean policy members
neil-marcellini Aug 29, 2022
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: 8 additions & 3 deletions src/components/AvatarWithIndicator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,20 @@ const AvatarWithIndicator = (props) => {
isLarge ? styles.statusIndicatorLarge : styles.statusIndicator,
];

// If a policy was just deleted from Onyx, then Onyx will pass a null value to the props, and
// those should be cleaned out before doing any error checking
const cleanPolicies = _.filter(props.policies, policy => policy);
const cleanPolicyMembers = _.filter(props.policiesMemberList, member => member);
Comment on lines +64 to +65
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wondering if using a compact which is a dedicated lodash function for this would not be better?? https://lodash.com/docs/4.17.15#compact

Or is there any of the falsey values which we need to account for?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tim answered here https://expensify.slack.com/archives/C07J32337/p1661786311194409?thread_ts=1661782875.058629&cid=C07J32337 no problem to use filter then


// All of the error-checking methods are put into an array. This is so that using _.some() will return
// early as soon as the first error is returned. This makes the error checking very efficient since
// we only care if a single error exists anywhere.
const errorCheckingMethods = [
() => !_.isEmpty(props.userWallet.errors),
() => PaymentMethods.hasPaymentMethodError(props.bankAccountList, props.cardList),
() => _.some(props.policies, PolicyUtils.hasPolicyError),
() => _.some(props.policies, PolicyUtils.hasCustomUnitsError),
() => _.some(props.policiesMemberList, PolicyUtils.hasPolicyMemberError),
() => _.some(cleanPolicies, PolicyUtils.hasPolicyError),
() => _.some(cleanPolicies, PolicyUtils.hasCustomUnitsError),
() => _.some(cleanPolicyMembers, PolicyUtils.hasPolicyMemberError),
];
const shouldShowIndicator = _.some(errorCheckingMethods, errorCheckingMethod => errorCheckingMethod());

Expand Down