From 0410ca416e9f9682ce4b6bf029bf6f04429583ea Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Wed, 26 Jan 2022 18:48:17 +0530
Subject: [PATCH 1/2] Remove extra margin from close Account button

---
 src/pages/settings/Security/CloseAccountPage.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/settings/Security/CloseAccountPage.js b/src/pages/settings/Security/CloseAccountPage.js
index 10025e29d772..6b8148dfecce 100644
--- a/src/pages/settings/Security/CloseAccountPage.js
+++ b/src/pages/settings/Security/CloseAccountPage.js
@@ -96,7 +96,6 @@ class CloseAccountPage extends Component {
                     <FixedFooter>
                         <Button
                             danger
-                            style={[styles.mb5]}
                             text={this.props.translate('closeAccountPage.closeAccount')}
                             isLoading={this.state.loading}
                             onPress={() => User.closeAccount(this.state.reasonForLeaving)}

From ff1fd3e3c074d9c879a02f7ebb4f2bf57c4759aa Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Wed, 26 Jan 2022 18:50:01 +0530
Subject: [PATCH 2/2] Small cleanup

---
 src/components/Button.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Button.js b/src/components/Button.js
index 87846f959372..eedd74040cbb 100644
--- a/src/components/Button.js
+++ b/src/components/Button.js
@@ -1,4 +1,3 @@
-import _ from 'underscore';
 import React, {Component} from 'react';
 import {Pressable, ActivityIndicator, View} from 'react-native';
 import PropTypes from 'prop-types';
@@ -9,6 +8,7 @@ import Text from './Text';
 import KeyboardShortcut from '../libs/KeyboardShortcut';
 import Icon from './Icon';
 import CONST from '../CONST';
+import * as StyleUtils from '../styles/StyleUtils';
 
 const propTypes = {
     /** The text for the button label */
@@ -101,7 +101,7 @@ const defaultProps = {
 class Button extends Component {
     constructor(props) {
         super(props);
-        this.additionalStyles = _.isArray(this.props.style) ? this.props.style : [this.props.style];
+        this.additionalStyles = StyleUtils.parseStyleAsArray(this.props.style);
 
         this.renderContent = this.renderContent.bind(this);
     }