From a937de641ca4a3394d4165093a07e4d22b911450 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Wed, 4 Jan 2023 10:06:08 +0200
Subject: [PATCH 1/3] Clarify dangerous form submit prop

---
 src/components/Form.js                          | 6 +++---
 src/components/FormAlertWithSubmitButton.js     | 8 ++++----
 src/pages/settings/Security/CloseAccountPage.js | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/Form.js b/src/components/Form.js
index f3f4a5a0cfb2..f20a609da0ee 100644
--- a/src/components/Form.js
+++ b/src/components/Form.js
@@ -53,7 +53,7 @@ const propTypes = {
     enabledWhenOffline: PropTypes.bool,
 
     /** Whether the action is dangerous */
-    isDangerousAction: PropTypes.bool,
+    isSubmitActionDangerous: PropTypes.bool,
 
     ...withLocalizePropTypes,
 };
@@ -66,7 +66,7 @@ const defaultProps = {
     },
     draftValues: {},
     enabledWhenOffline: false,
-    isDangerousAction: false,
+    isSubmitActionDangerous: false,
 };
 
 class Form extends React.Component {
@@ -280,7 +280,7 @@ class Form extends React.Component {
                             }}
                             containerStyles={[styles.mh0, styles.mt5, styles.flex1]}
                             enabledWhenOffline={this.props.enabledWhenOffline}
-                            isDangerousAction={this.props.isDangerousAction}
+                            isSubmitActionDangerous={this.props.isSubmitActionDangerous}
                         />
                         )}
                     </View>
diff --git a/src/components/FormAlertWithSubmitButton.js b/src/components/FormAlertWithSubmitButton.js
index fdace1fcc40f..38e01d6b1dbc 100644
--- a/src/components/FormAlertWithSubmitButton.js
+++ b/src/components/FormAlertWithSubmitButton.js
@@ -37,7 +37,7 @@ const propTypes = {
     enabledWhenOffline: PropTypes.bool,
 
     /** Whether the action is dangerous */
-    isDangerousAction: PropTypes.bool,
+    isSubmitActionDangerous: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -48,7 +48,7 @@ const defaultProps = {
     isLoading: false,
     onFixTheErrorsLinkPressed: () => {},
     enabledWhenOffline: false,
-    isDangerousAction: false,
+    isSubmitActionDangerous: false,
 };
 
 const FormAlertWithSubmitButton = props => (
@@ -65,7 +65,7 @@ const FormAlertWithSubmitButton = props => (
                 isDisabled
                 text={props.buttonText}
                 style={[styles.mb3]}
-                danger={props.isDangerousAction}
+                danger={props.isSubmitActionDangerous}
             />
         ) : (
             <Button
@@ -75,7 +75,7 @@ const FormAlertWithSubmitButton = props => (
                 onPress={props.onSubmit}
                 isDisabled={props.isDisabled}
                 isLoading={props.isLoading}
-                danger={props.isDangerousAction}
+                danger={props.isSubmitActionDangerous}
             />
         ))}
     </FormAlertWrapper>
diff --git a/src/pages/settings/Security/CloseAccountPage.js b/src/pages/settings/Security/CloseAccountPage.js
index 7df63b853633..7a75d9c88249 100644
--- a/src/pages/settings/Security/CloseAccountPage.js
+++ b/src/pages/settings/Security/CloseAccountPage.js
@@ -74,7 +74,7 @@ class CloseAccountPage extends Component {
                     onSubmit={this.onSubmit}
                     submitButtonText={this.props.translate('closeAccountPage.closeAccount')}
                     style={[styles.flexGrow1, styles.mh5]}
-                    isDangerousAction
+                    isSubmitActionDangerous
                 >
                     <View style={[styles.flexGrow1]}>
                         <Text>{this.props.translate('closeAccountPage.reasonForLeavingPrompt')}</Text>

From eb674c2c22bb24e85b33b8d01209cd0b4d1f1e36 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Wed, 4 Jan 2023 10:06:50 +0200
Subject: [PATCH 2/3] Update new prop name comment

---
 src/components/Form.js                      | 2 +-
 src/components/FormAlertWithSubmitButton.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Form.js b/src/components/Form.js
index f20a609da0ee..86512304287f 100644
--- a/src/components/Form.js
+++ b/src/components/Form.js
@@ -52,7 +52,7 @@ const propTypes = {
     /** Should the button be enabled when offline */
     enabledWhenOffline: PropTypes.bool,
 
-    /** Whether the action is dangerous */
+    /** Whether the form submit action is dangerous */
     isSubmitActionDangerous: PropTypes.bool,
 
     ...withLocalizePropTypes,
diff --git a/src/components/FormAlertWithSubmitButton.js b/src/components/FormAlertWithSubmitButton.js
index 38e01d6b1dbc..b8e6409c8444 100644
--- a/src/components/FormAlertWithSubmitButton.js
+++ b/src/components/FormAlertWithSubmitButton.js
@@ -36,7 +36,7 @@ const propTypes = {
     /** Should the button be enabled when offline */
     enabledWhenOffline: PropTypes.bool,
 
-    /** Whether the action is dangerous */
+    /** Whether the form submit action is dangerous */
     isSubmitActionDangerous: PropTypes.bool,
 };
 

From 6524cca1c7186bd2182ebb22062ba3fbafc81e34 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Wed, 4 Jan 2023 10:23:11 +0200
Subject: [PATCH 3/3] Remove unused prop

---
 src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
index 6390fdafd7b1..6b49bf67e943 100644
--- a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -464,7 +464,6 @@ class BasePaymentsPage extends React.Component {
                         this.makeDefaultPaymentMethod(password);
                     }}
                     submitButtonText={this.state.passwordButtonText}
-                    isDangerousAction
                 />
             </ScreenWrapper>
         );