Refactor isDisabledCheckbox

Expensify · Mar 13, 2024 · d696446 · d696446
1 parent d772221
commit d696446
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/components/SelectionList/BaseListItem.tsx b/src/components/SelectionList/BaseListItem.tsx
@@ -34,8 +34,6 @@ function BaseListItem<TItem extends ListItem>({
     const StyleUtils = useStyleUtils();
     const {hovered, bind} = useHover();
 
-    const isDisabledCheckbox = item.isDisabledCheckbox === undefined || item.isDisabledCheckbox;
-
     const rightHandSideComponentRender = () => {
         if (canSelectMultiple || !rightHandSideComponent) {
             return null;
@@ -83,9 +81,9 @@ function BaseListItem<TItem extends ListItem>({
                             accessibilityLabel={item.text ?? ''}
                             role={CONST.ROLE.BUTTON}
                             // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                            disabled={isDisabled || !isDisabledCheckbox}
+                            disabled={isDisabled || item.isDisabledCheckbox}
                             onPress={handleCheckboxPress}
-                            style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), !isDisabledCheckbox && styles.cursorDisabled]}
+                            style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled]}
                         >
                             <View style={selectMultipleStyle}>
                                 {item.isSelected && (

diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
@@ -120,7 +120,7 @@ function BaseSelectionList<TItem extends ListItem>(
 
                 // If disabled, add to the disabled indexes array
                 // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                if (!!section.isDisabled || item.isDisabled || item.isDisabledCheckbox === false) {
+                if (!!section.isDisabled || item.isDisabled || item.isDisabledCheckbox) {
                     disabledOptionsIndexes.push(disabledIndex);
                 }
                 disabledIndex += 1;

diff --git a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
@@ -71,7 +71,7 @@ function WorkspaceTaxesPage({policy, route}: WorkspaceTaxesPageProps) {
                     alternateText: textForDefault(key),
                     keyForList: key,
                     isSelected: !!selectedTaxesIDs.includes(key),
-                    isDisabledCheckbox: key !== defaultExternalID,
+                    isDisabledCheckbox: key === defaultExternalID,
                     rightElement: (
                         <View style={styles.flexRow}>
                             <Text style={[styles.disabledText, styles.alignSelfCenter]}>