Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/Button.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import _ from 'underscore';
import React, {Component} from 'react';
import {Pressable, ActivityIndicator, View} from 'react-native';
import PropTypes from 'prop-types';
Expand All @@ -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 */
Expand Down Expand Up @@ -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);
}
Expand Down
1 change: 0 additions & 1 deletion src/pages/settings/Security/CloseAccountPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)}
Expand Down