Merge pull request #18929 from aimane-chnaif/fix/proptype-warning

[No QA] fix propType warning, make prettier happy
Expensify · May 14, 2023 · 6c10bb2 · 6c10bb2
2 parents 2e73562 + b715025
commit 6c10bb2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
@@ -261,7 +261,7 @@ class AttachmentModal extends PureComponent {
                     backgroundColor={themeColors.componentBG}
                     onModalShow={() => {
                         this.props.onModalShow();
-                        this.setState({shouldLoadAttachment: true})
+                        this.setState({shouldLoadAttachment: true});
                     }}
                     onModalHide={(e) => {
                         this.props.onModalHide(e);

diff --git a/src/components/Pressable/PressableWithFeedback.js b/src/components/Pressable/PressableWithFeedback.js
@@ -54,13 +54,13 @@ const PressableWithFeedback = forwardRef((props, ref) => {
         >
             {(state) => (
                 <OpacityView
-                    shouldDim={!disabled && (state.pressed || state.hovered)}
+                    shouldDim={Boolean(!disabled && (state.pressed || state.hovered))}
                     dimmingValue={state.pressed ? props.pressDimmingValue : props.hoverDimmingValue}
                     style={[
-                        StyleUtils.parseStyleFromFunction(props.style, state),
-                        !disabled && state.pressed && StyleUtils.parseStyleFromFunction(props.pressStyle, state),
-                        !disabled && state.hovered && StyleUtils.parseStyleAsArray(props.hoverStyle, state),
-                        state.focused && StyleUtils.parseStyleAsArray(props.focusStyle, state),
+                        ...StyleUtils.parseStyleFromFunction(props.style, state),
+                        ...(!disabled && state.pressed ? StyleUtils.parseStyleFromFunction(props.pressStyle, state) : []),
+                        ...(!disabled && state.hovered ? StyleUtils.parseStyleAsArray(props.hoverStyle, state) : []),
+                        ...(state.focused ? StyleUtils.parseStyleAsArray(props.focusStyle, state) : []),
                     ]}
                 >
                     {props.children}