Merge pull request #19292 from bernhardoj/fix/19181-console-error

Update ref prop types
Expensify · May 22, 2023 · f321c89 · f321c89
2 parents 0ec61bf + a4f0306
commit f321c89
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/src/components/Button/index.js b/src/components/Button/index.js
@@ -111,7 +111,8 @@ const propTypes = {
     accessibilityLabel: PropTypes.string,
 
     /** A ref to forward the button */
-    forwardedRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({current: PropTypes.oneOfType([PropTypes.instanceOf(React.Component), PropTypes.func])})]),
+    // eslint-disable-next-line react/forbid-prop-types
+    forwardedRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({current: PropTypes.object})]),
 };
 
 const defaultProps = {

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
@@ -69,7 +69,7 @@ const propTypes = {
     navigateToStep: PropTypes.func.isRequired,
 
     /** The policyID of the request */
-    policyID: PropTypes.string.isRequired,
+    policyID: PropTypes.string,
 };
 
 const defaultProps = {
@@ -81,6 +81,7 @@ const defaultProps = {
     session: {
         email: null,
     },
+    policyID: '',
     ...withCurrentUserPersonalDetailsDefaultProps,
 };
 

diff --git a/src/components/SettlementButton.js b/src/components/SettlementButton.js
@@ -49,7 +49,7 @@ const propTypes = {
     nvp_lastPaymentMethod: PropTypes.objectOf(PropTypes.string),
 
     /** The policyID of the report we are paying */
-    policyID: PropTypes.string.isRequired,
+    policyID: PropTypes.string,
 
     /** Additional styles to add to the component */
     style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
@@ -66,6 +66,7 @@ const defaultProps = {
     nvp_lastPaymentMethod: {},
     style: [],
     iouReport: {},
+    policyID: '',
 };
 
 class SettlementButton extends React.Component {

diff --git a/src/components/withNavigationFallback.js b/src/components/withNavigationFallback.js
@@ -36,7 +36,8 @@ export default function (WrappedComponent) {
     WithNavigationFallback.contextType = NavigationContext;
     WithNavigationFallback.displayName = `WithNavigationFocusWithFallback(${getComponentDisplayName(WrappedComponent)})`;
     WithNavigationFallback.propTypes = {
-        forwardedRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({current: PropTypes.oneOfType([PropTypes.instanceOf(React.Component), PropTypes.func])})]),
+        // eslint-disable-next-line react/forbid-prop-types
+        forwardedRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({current: PropTypes.object})]),
     };
     WithNavigationFallback.defaultProps = {
         forwardedRef: undefined,

diff --git a/src/components/withNavigationFocus.js b/src/components/withNavigationFocus.js
@@ -22,7 +22,8 @@ export default function withNavigationFocus(WrappedComponent) {
 
     WithNavigationFocus.displayName = `withNavigationFocus(${getComponentDisplayName(WrappedComponent)})`;
     WithNavigationFocus.propTypes = {
-        forwardedRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({current: PropTypes.oneOfType([PropTypes.instanceOf(React.Component), PropTypes.func])})]),
+        // eslint-disable-next-line react/forbid-prop-types
+        forwardedRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({current: PropTypes.object})]),
     };
     WithNavigationFocus.defaultProps = {
         forwardedRef: undefined,

diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js
@@ -30,12 +30,13 @@ const propTypes = {
     navigateToStep: PropTypes.func.isRequired,
 
     /** The policyID of the request */
-    policyID: PropTypes.string.isRequired,
+    policyID: PropTypes.string,
 };
 
 const defaultProps = {
     iouType: CONST.IOU.MONEY_REQUEST_TYPE.REQUEST,
     canModifyParticipants: false,
+    policyID: '',
 };
 
 const MoneyRequestConfirmPage = (props) => (