From bba25aeaac35ef9affb09f7f30a08ed2b039558e Mon Sep 17 00:00:00 2001
From: mashazyu <mariya.z@gmail.com>
Date: Mon, 20 Apr 2020 17:02:11 +0200
Subject: [PATCH] Sets default button type to small and moves action names to
 config file

---
 components/common/button.js                         |  4 ++++
 components/home.js                                  |  2 +-
 components/settings/data-management/index.js        | 13 +++++++------
 components/settings/password/enter-new-password.js  |  2 +-
 components/settings/shared/confirm-with-password.js |  6 +++---
 config.js                                           |  4 ++++
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/components/common/button.js b/components/common/button.js
index e7bc7e4..46c5838 100644
--- a/components/common/button.js
+++ b/components/common/button.js
@@ -26,6 +26,10 @@ Button.propTypes = {
   testID: PropTypes.string
 }
 
+Button.defaultProps = {
+  isSmall: true
+}
+
 const text = {
   padding: Spacing.base,
   textTransform: 'uppercase'
diff --git a/components/home.js b/components/home.js
index 7cc52a0..bff1c4c 100644
--- a/components/home.js
+++ b/components/home.js
@@ -93,7 +93,7 @@ class Home extends Component {
         <View style={styles.line}>
           <AppText>{prediction}</AppText>
         </View>
-        <Button onPress={this.navigateToCycleDayView} isCTA>
+        <Button isCTA isSmall={false} onPress={this.navigateToCycleDayView}>
           {labels.addData}
         </Button>
         {phase && (
diff --git a/components/settings/data-management/index.js b/components/settings/data-management/index.js
index 56d3c8a..2848fe7 100644
--- a/components/settings/data-management/index.js
+++ b/components/settings/data-management/index.js
@@ -11,6 +11,7 @@ import openShareDialogAndExport from './export-dialog'
 import DeleteData from './delete-data'
 
 import labels from '../../../i18n/en/settings'
+import { ACTION_DELETE, ACTION_EXPORT, ACTION_IMPORT } from '../../../config'
 
 export default class DataManagement extends Component {
 
@@ -41,12 +42,12 @@ export default class DataManagement extends Component {
   }
 
   startExport = () => {
-    this.setCurrentAction('export')
+    this.setCurrentAction(ACTION_EXPORT)
     openShareDialogAndExport()
   }
 
   startImport = () => {
-    this.setCurrentAction('import')
+    this.setCurrentAction(ACTION_IMPORT)
     openImportDialog(this.startImportFlow)
   }
 
@@ -56,7 +57,7 @@ export default class DataManagement extends Component {
 
   render() {
     const { currentAction, isLoading } = this.state
-    const isDeletingData = currentAction === 'delete'
+    const isDeletingData = currentAction === ACTION_DELETE
 
     return (
       <AppPage>
@@ -65,13 +66,13 @@ export default class DataManagement extends Component {
           <React.Fragment>
             <Segment title={labels.export.button}>
               <AppText>{labels.export.segmentExplainer}</AppText>
-              <Button isCTA onPress={this.startExport}>
+              <Button isCTA isSmall={false} onPress={this.startExport}>
                 {labels.export.button}
               </Button>
             </Segment>
             <Segment title={labels.import.button}>
               <AppText>{labels.import.segmentExplainer}</AppText>
-              <Button isCTA onPress={this.startImport}>
+              <Button isCTA isSmall={false} onPress={this.startImport}>
                 {labels.import.button}
               </Button>
             </Segment>
@@ -79,7 +80,7 @@ export default class DataManagement extends Component {
               <AppText>{labels.deleteSegment.explainer}</AppText>
               <DeleteData
                 isDeletingData = {isDeletingData}
-                onStartDeletion = {() => this.setCurrentAction('delete')}
+                onStartDeletion = {() => this.setCurrentAction(ACTION_DELETE)}
               />
             </Segment>
           </React.Fragment>
diff --git a/components/settings/password/enter-new-password.js b/components/settings/password/enter-new-password.js
index 283755b..0c8617f 100644
--- a/components/settings/password/enter-new-password.js
+++ b/components/settings/password/enter-new-password.js
@@ -79,7 +79,7 @@ export default class EnterNewPassword extends Component {
         {shouldShowErrorMessage &&
           <AppText style={styles.error}>{labels.passwordsDontMatch}</AppText>
         }
-        <Button isCTA={isButtonActive} isSmall onPress={this.savePassword}>
+        <Button isCTA={isButtonActive} onPress={this.savePassword}>
           {labels.savePassword}
         </Button>
       </React.Fragment>
diff --git a/components/settings/shared/confirm-with-password.js b/components/settings/shared/confirm-with-password.js
index a3c845a..23bd5a4 100644
--- a/components/settings/shared/confirm-with-password.js
+++ b/components/settings/shared/confirm-with-password.js
@@ -62,7 +62,7 @@ export default class ConfirmWithPassword extends Component {
   render() {
     const { password } = this.state
     const labels = settings.passwordSettings
-    const isCTA = password !== null
+    const isPassword = password !== null
 
     return (
       <React.Fragment>
@@ -72,10 +72,10 @@ export default class ConfirmWithPassword extends Component {
           value={password}
         />
         <View style={styles.container}>
-          <Button isSmall onPress={this.props.onCancel}>
+          <Button onPress={this.props.onCancel}>
             {shared.cancel}
           </Button>
-          <Button isCTA={isCTA} isSmall onPress={this.initPasswordCheck}>
+          <Button isCTA={isPassword} onPress={this.initPasswordCheck}>
             {shared.confirmToProceed}
           </Button>
         </View>
diff --git a/config.js b/config.js
index 7cd3960..1fd1589 100644
--- a/config.js
+++ b/config.js
@@ -27,4 +27,8 @@ const config = {
 
 config.columnMiddle = config.columnWidth / 2
 
+export const ACTION_DELETE = 'delete'
+export const ACTION_EXPORT = 'export'
+export const ACTION_IMPORT = 'import'
+
 export default config
\ No newline at end of file