From 8cf7fe58b2a8aa890fcd0a98ae9d7b5b12e69d7c Mon Sep 17 00:00:00 2001 From: Sameera Madushan Date: Mon, 22 Mar 2021 13:20:52 +0530 Subject: [PATCH 1/8] Update modal design change --- src/CONST.js | 1 + src/components/Modal/ModalPropTypes.js | 1 + .../UpdateAppModal/BaseUpdateAppModal.js | 55 +++++++++++-------- src/styles/getModalStyles.js | 31 +++++++++++ src/styles/utilities/spacing.js | 8 +++ 5 files changed, 74 insertions(+), 22 deletions(-) diff --git a/src/CONST.js b/src/CONST.js index 6e4841f27de4..7f4dfe6e3154 100644 --- a/src/CONST.js +++ b/src/CONST.js @@ -24,6 +24,7 @@ const CONST = { }, MODAL: { MODAL_TYPE: { + CONFIRM: 'confirm', CENTERED: 'centered', BOTTOM_DOCKED: 'bottom_docked', POPOVER: 'popover', diff --git a/src/components/Modal/ModalPropTypes.js b/src/components/Modal/ModalPropTypes.js index 565b9dbaf47b..54d509921552 100644 --- a/src/components/Modal/ModalPropTypes.js +++ b/src/components/Modal/ModalPropTypes.js @@ -20,6 +20,7 @@ const propTypes = { // Style of modal to display type: PropTypes.oneOf([ + CONST.MODAL.MODAL_TYPE.CONFIRM, CONST.MODAL.MODAL_TYPE.CENTERED, CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED, CONST.MODAL.MODAL_TYPE.POPOVER, diff --git a/src/components/UpdateAppModal/BaseUpdateAppModal.js b/src/components/UpdateAppModal/BaseUpdateAppModal.js index 3741996d3159..cfd1435ded42 100644 --- a/src/components/UpdateAppModal/BaseUpdateAppModal.js +++ b/src/components/UpdateAppModal/BaseUpdateAppModal.js @@ -1,11 +1,12 @@ import React, {PureComponent} from 'react'; import { - TouchableOpacity, Text, + TouchableOpacity, Text, View, } from 'react-native'; -import HeaderWithCloseButton from '../HeaderWithCloseButton'; +import Header from '../Header'; import Modal from '../Modal'; import styles from '../../styles/styles'; import {propTypes, defaultProps} from './UpdateAppModalPropTypes'; +import CONST from '../../CONST'; class BaseUpdateAppModal extends PureComponent { constructor(props) { @@ -33,31 +34,41 @@ class BaseUpdateAppModal extends PureComponent { onSubmit={this.submitAndClose} onClose={() => this.setState({isModalOpen: false})} isVisible={this.state.isModalOpen} + type={CONST.MODAL.MODAL_TYPE.CONFIRM} > - this.setState({isModalOpen: false})} - /> - - A new version of Expensify.cash is available. - Update now or restart the app at a later time to download the latest changes. - - {this.props.onSubmit && ( + + +
+ + + A new version of Expensify.cash is available. + Update now or restart the app at a later time to download the latest changes. + + {this.props.onSubmit && ( + + + Update App + + + )} this.setState({isModalOpen: false})} > - - Update App + + Cancel - )} + ); diff --git a/src/styles/getModalStyles.js b/src/styles/getModalStyles.js index dc5319b441a1..30819ec9039f 100644 --- a/src/styles/getModalStyles.js +++ b/src/styles/getModalStyles.js @@ -19,6 +19,37 @@ export default (type, windowDimensions, popoverAnchorPosition = {}) => { let shouldAddTopSafeAreaPadding = false; switch (type) { + case CONST.MODAL.MODAL_TYPE.CONFIRM: + // A confirm modal is one that has a visible backdrop + // and can be dismissed by clicking outside of the modal. + modalStyle = { + ...modalStyle, + ...{ + alignItems: 'center', + }, + }; + modalContainerStyle = { + // Shadow Styles + shadowColor: colors.black, + shadowOffset: { + width: 0, + height: 0, + }, + shadowOpacity: 0.1, + shadowRadius: 5, + + borderRadius: 12, + overflow: 'hidden', + width: isSmallScreenWidth ? '90%' : windowWidth * 0.3, + minWidth: isSmallScreenWidth ? '90%' : 400, + }; + + // setting this to undefined we effectively disable the + // ability to swipe our modal + swipeDirection = undefined; + animationIn = 'fadeIn'; + animationOut = 'fadeOut'; + break; case CONST.MODAL.MODAL_TYPE.CENTERED: // A centered modal is one that has a visible backdrop // and can be dismissed by clicking outside of the modal. diff --git a/src/styles/utilities/spacing.js b/src/styles/utilities/spacing.js index ba8b03f522f3..2fe247fecdcb 100644 --- a/src/styles/utilities/spacing.js +++ b/src/styles/utilities/spacing.js @@ -13,6 +13,14 @@ export default { margin: 8, }, + m4: { + margin: 16, + }, + + m5: { + margin: 20, + }, + mh1: { marginHorizontal: 4, }, From 7a2d5a5c3b4f64e3b051310c1b3ccd05c7e3e007 Mon Sep 17 00:00:00 2001 From: Sameera Madushan Date: Mon, 22 Mar 2021 15:52:14 +0530 Subject: [PATCH 2/8] Adding bottom docked modal and fixing width --- src/components/UpdateAppModal/BaseUpdateAppModal.js | 6 ++++-- src/styles/getModalStyles.js | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/UpdateAppModal/BaseUpdateAppModal.js b/src/components/UpdateAppModal/BaseUpdateAppModal.js index cfd1435ded42..99e364b5338e 100644 --- a/src/components/UpdateAppModal/BaseUpdateAppModal.js +++ b/src/components/UpdateAppModal/BaseUpdateAppModal.js @@ -7,6 +7,7 @@ import Modal from '../Modal'; import styles from '../../styles/styles'; import {propTypes, defaultProps} from './UpdateAppModalPropTypes'; import CONST from '../../CONST'; +import withWindowDimensions from '../withWindowDimensions'; class BaseUpdateAppModal extends PureComponent { constructor(props) { @@ -34,7 +35,8 @@ class BaseUpdateAppModal extends PureComponent { onSubmit={this.submitAndClose} onClose={() => this.setState({isModalOpen: false})} isVisible={this.state.isModalOpen} - type={CONST.MODAL.MODAL_TYPE.CONFIRM} + type={this.props.isSmallScreenWidth + ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.CONFIRM} > @@ -77,4 +79,4 @@ class BaseUpdateAppModal extends PureComponent { BaseUpdateAppModal.propTypes = propTypes; BaseUpdateAppModal.defaultProps = defaultProps; -export default BaseUpdateAppModal; +export default withWindowDimensions(BaseUpdateAppModal); diff --git a/src/styles/getModalStyles.js b/src/styles/getModalStyles.js index 30819ec9039f..f3ab417db1a4 100644 --- a/src/styles/getModalStyles.js +++ b/src/styles/getModalStyles.js @@ -40,8 +40,7 @@ export default (type, windowDimensions, popoverAnchorPosition = {}) => { borderRadius: 12, overflow: 'hidden', - width: isSmallScreenWidth ? '90%' : windowWidth * 0.3, - minWidth: isSmallScreenWidth ? '90%' : 400, + width: variables.sideBarWidth, }; // setting this to undefined we effectively disable the From c264880e898ca52da411a69f9c0f581b5c8f56bc Mon Sep 17 00:00:00 2001 From: Sameera Madushan Date: Tue, 23 Mar 2021 00:42:45 +0530 Subject: [PATCH 3/8] Re-usable confirm modal added --- src/components/ConfirmModal/index.js | 98 +++++++++++++++++++ .../UpdateAppModal/BaseUpdateAppModal.js | 60 +++--------- 2 files changed, 109 insertions(+), 49 deletions(-) create mode 100644 src/components/ConfirmModal/index.js diff --git a/src/components/ConfirmModal/index.js b/src/components/ConfirmModal/index.js new file mode 100644 index 000000000000..f415abb2cb5f --- /dev/null +++ b/src/components/ConfirmModal/index.js @@ -0,0 +1,98 @@ +import React from 'react'; +import { + TouchableOpacity, Text, View, +} from 'react-native'; +import PropTypes from 'prop-types'; +import Header from '../Header'; +import Modal from '../Modal'; +import styles from '../../styles/styles'; +import CONST from '../../CONST'; +import withWindowDimensions from '../withWindowDimensions'; + +const propTypes = { + /** Title of the modal */ + title: PropTypes.string.isRequired, + + /** A callback to call when the form has been submitted */ + onConfirm: PropTypes.func.isRequired, + + /** A callback to call when the form has been closed */ + onCancel: PropTypes.func.isRequired, + + /** If the screen is small */ + isSmallScreenWidth: PropTypes.bool.isRequired, + + /** Modal visibility */ + isVisible: PropTypes.bool.isRequired, + + /** Confirm button text */ + confirmText: PropTypes.string, + + /** Cancel button text */ + cancelText: PropTypes.string, + + /** Modal content text */ + prompt: PropTypes.string, +}; + +const defaultProps = { + confirmText: 'Yes', + cancelText: 'No', + prompt: '', +}; + +const ConfirmModal = ({ + title, onConfirm, onCancel, confirmText, cancelText, prompt, isSmallScreenWidth, isVisible, +}) => { + const modalType = isSmallScreenWidth + ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.CONFIRM; + + return ( + <> + + + +
+ + + + {prompt} + + + + + {confirmText} + + + + + + {cancelText} + + + + + + ); +}; + +ConfirmModal.propTypes = propTypes; +ConfirmModal.defaultProps = defaultProps; +export default withWindowDimensions(ConfirmModal); diff --git a/src/components/UpdateAppModal/BaseUpdateAppModal.js b/src/components/UpdateAppModal/BaseUpdateAppModal.js index 99e364b5338e..e547c460e95f 100644 --- a/src/components/UpdateAppModal/BaseUpdateAppModal.js +++ b/src/components/UpdateAppModal/BaseUpdateAppModal.js @@ -1,13 +1,6 @@ import React, {PureComponent} from 'react'; -import { - TouchableOpacity, Text, View, -} from 'react-native'; -import Header from '../Header'; -import Modal from '../Modal'; -import styles from '../../styles/styles'; import {propTypes, defaultProps} from './UpdateAppModalPropTypes'; -import CONST from '../../CONST'; -import withWindowDimensions from '../withWindowDimensions'; +import ConfirmModal from '../ConfirmModal'; class BaseUpdateAppModal extends PureComponent { constructor(props) { @@ -31,47 +24,16 @@ class BaseUpdateAppModal extends PureComponent { render() { return ( <> - this.setState({isModalOpen: false})} + - - -
- - - A new version of Expensify.cash is available. - Update now or restart the app at a later time to download the latest changes. - - {this.props.onSubmit && ( - - - Update App - - - )} - this.setState({isModalOpen: false})} - > - - Cancel - - - - + onConfirm={this.submitAndClose} + onCancel={() => this.setState({isModalOpen: false})} + prompt="A new version of Expensify.cash is available. + Update now or restart the app at a later time to download the latest changes." + confirmText="Update App" + cancelText="Cancel" + /> ); } @@ -79,4 +41,4 @@ class BaseUpdateAppModal extends PureComponent { BaseUpdateAppModal.propTypes = propTypes; BaseUpdateAppModal.defaultProps = defaultProps; -export default withWindowDimensions(BaseUpdateAppModal); +export default BaseUpdateAppModal; From 3ad5627030e11008364c8e8cc0d9938592b3e548 Mon Sep 17 00:00:00 2001 From: Sameera Madushan Date: Tue, 23 Mar 2021 01:26:42 +0530 Subject: [PATCH 4/8] Fixing Review comments --- src/components/ConfirmModal.js | 91 ++++++++++++++++++++++++++ src/components/ConfirmModal/index.js | 98 ---------------------------- 2 files changed, 91 insertions(+), 98 deletions(-) create mode 100644 src/components/ConfirmModal.js delete mode 100644 src/components/ConfirmModal/index.js diff --git a/src/components/ConfirmModal.js b/src/components/ConfirmModal.js new file mode 100644 index 000000000000..efcaa020f18d --- /dev/null +++ b/src/components/ConfirmModal.js @@ -0,0 +1,91 @@ +import React from 'react'; +import { + TouchableOpacity, Text, View, +} from 'react-native'; +import PropTypes from 'prop-types'; +import Header from './Header'; +import Modal from './Modal'; +import styles from '../styles/styles'; +import CONST from '../CONST'; +import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimensions'; + +const propTypes = { + /** Title of the modal */ + title: PropTypes.string.isRequired, + + /** A callback to call when the form has been submitted */ + onConfirm: PropTypes.func.isRequired, + + /** A callback to call when the form has been closed */ + onCancel: PropTypes.func.isRequired, + + /** Modal visibility */ + isVisible: PropTypes.bool.isRequired, + + /** Confirm button text */ + confirmText: PropTypes.string, + + /** Cancel button text */ + cancelText: PropTypes.string, + + /** Modal content text */ + prompt: PropTypes.string, + + ...windowDimensionsPropTypes, +}; + +const defaultProps = { + confirmText: 'Yes', + cancelText: 'No', + prompt: '', +}; + +const ConfirmModal = props => ( + + + +
+ + + + {props.prompt} + + + + + {props.confirmText} + + + + + + {props.cancelText} + + + + +); + +ConfirmModal.propTypes = propTypes; +ConfirmModal.defaultProps = defaultProps; +ConfirmModal.displayName = 'ConfirmModal'; +export default withWindowDimensions(ConfirmModal); diff --git a/src/components/ConfirmModal/index.js b/src/components/ConfirmModal/index.js deleted file mode 100644 index f415abb2cb5f..000000000000 --- a/src/components/ConfirmModal/index.js +++ /dev/null @@ -1,98 +0,0 @@ -import React from 'react'; -import { - TouchableOpacity, Text, View, -} from 'react-native'; -import PropTypes from 'prop-types'; -import Header from '../Header'; -import Modal from '../Modal'; -import styles from '../../styles/styles'; -import CONST from '../../CONST'; -import withWindowDimensions from '../withWindowDimensions'; - -const propTypes = { - /** Title of the modal */ - title: PropTypes.string.isRequired, - - /** A callback to call when the form has been submitted */ - onConfirm: PropTypes.func.isRequired, - - /** A callback to call when the form has been closed */ - onCancel: PropTypes.func.isRequired, - - /** If the screen is small */ - isSmallScreenWidth: PropTypes.bool.isRequired, - - /** Modal visibility */ - isVisible: PropTypes.bool.isRequired, - - /** Confirm button text */ - confirmText: PropTypes.string, - - /** Cancel button text */ - cancelText: PropTypes.string, - - /** Modal content text */ - prompt: PropTypes.string, -}; - -const defaultProps = { - confirmText: 'Yes', - cancelText: 'No', - prompt: '', -}; - -const ConfirmModal = ({ - title, onConfirm, onCancel, confirmText, cancelText, prompt, isSmallScreenWidth, isVisible, -}) => { - const modalType = isSmallScreenWidth - ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.CONFIRM; - - return ( - <> - - - -
- - - - {prompt} - - - - - {confirmText} - - - - - - {cancelText} - - - - - - ); -}; - -ConfirmModal.propTypes = propTypes; -ConfirmModal.defaultProps = defaultProps; -export default withWindowDimensions(ConfirmModal); From 9adb0a56a0132af7a49ccc26eb8ee8cae870a21b Mon Sep 17 00:00:00 2001 From: Sameera Madushan Date: Tue, 23 Mar 2021 17:24:15 +0530 Subject: [PATCH 5/8] Style changes for Review --- src/components/ConfirmModal.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/ConfirmModal.js b/src/components/ConfirmModal.js index efcaa020f18d..2e10bb1fddf0 100644 --- a/src/components/ConfirmModal.js +++ b/src/components/ConfirmModal.js @@ -50,11 +50,11 @@ const ConfirmModal = props => ( : CONST.MODAL.MODAL_TYPE.CONFIRM} > - +
- + {props.prompt} @@ -66,7 +66,6 @@ const ConfirmModal = props => ( style={[ styles.buttonText, styles.buttonSuccessText, - styles.buttonConfirmText, ]} > {props.confirmText} From f16ff72d77da67c4707f29cf95266aee2a636bde Mon Sep 17 00:00:00 2001 From: Sameera Madushan Date: Wed, 24 Mar 2021 00:23:12 +0530 Subject: [PATCH 6/8] Updating react-native-web to v15 --- package-lock.json | 44 ++++++++++++++++++++++++++++++++++---------- package.json | 2 +- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 55270dbd72db..e08057d59e82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12628,9 +12628,9 @@ "dev": true }, "inline-style-prefixer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-5.1.2.tgz", - "integrity": "sha512-PYUF+94gDfhy+LsQxM0g3d6Hge4l1pAqOSOiZuHWzMvQEGsbRQ/ck2WioLqrY2ZkHyPgVUXxn+hrkF7D6QUGbA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-6.0.0.tgz", + "integrity": "sha512-XTHvRUS4ZJNzC1GixJRmOlWSS45fSt+DJoyQC9ytj0WxQfcgofQtDtyKKYxHUqEsWCs+LIWftPF1ie7+i012Fg==", "requires": { "css-in-js-utils": "^2.0.0" } @@ -21457,19 +21457,43 @@ } }, "react-native-web": { - "version": "0.14.10", - "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.14.10.tgz", - "integrity": "sha512-YTvYnUUPnOjU50GiXk90cm6atk714vF8p7HhBlqHtLtftHk9xQRwgxXzoMHiKf0Bx20Dyo2SGvv4XrPxcmEheQ==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.15.0.tgz", + "integrity": "sha512-42Ax8MyQ8FX2t4iJC2i091IIlXR1KuQn4lPvX+dm1K86Z6uuibwRZgJOxUBsQZJqdLrZQ9qeknJsGErOcJgaOg==", "requires": { "array-find-index": "^1.0.2", - "create-react-class": "^15.6.2", + "create-react-class": "^15.7.0", "deep-assign": "^3.0.0", - "fbjs": "^1.0.0", - "hyphenate-style-name": "^1.0.3", - "inline-style-prefixer": "^5.1.0", + "fbjs": "^3.0.0", + "hyphenate-style-name": "^1.0.4", + "inline-style-prefixer": "^6.0.0", "normalize-css-color": "^1.0.2", "prop-types": "^15.6.0", "react-timer-mixin": "^0.13.4" + }, + "dependencies": { + "fbjs": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.0.tgz", + "integrity": "sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg==", + "requires": { + "cross-fetch": "^3.0.4", + "fbjs-css-vars": "^1.0.0", + "loose-envify": "^1.0.0", + "object-assign": "^4.1.0", + "promise": "^7.1.1", + "setimmediate": "^1.0.5", + "ua-parser-js": "^0.7.18" + } + }, + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "requires": { + "asap": "~2.0.3" + } + } } }, "react-pdf": { diff --git a/package.json b/package.json index 92149bd3ef0d..e6f3ea21c297 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "react-native-safe-area-context": "^3.1.4", "react-native-screens": "2.17.1", "react-native-svg": "^12.1.0", - "react-native-web": "^0.14.1", + "react-native-web": "^0.15.0", "react-pdf": "^5.2.0", "react-web-config": "^1.0.0", "rn-fetch-blob": "^0.12.0", From a2bd79b4f7535a7c39505e645c39c83bc1f76447 Mon Sep 17 00:00:00 2001 From: Sameera Madushan Date: Wed, 24 Mar 2021 00:23:48 +0530 Subject: [PATCH 7/8] Setting touchable focusable to false --- src/components/ConfirmModal.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/ConfirmModal.js b/src/components/ConfirmModal.js index 2e10bb1fddf0..49822433cf85 100644 --- a/src/components/ConfirmModal.js +++ b/src/components/ConfirmModal.js @@ -61,6 +61,7 @@ const ConfirmModal = props => ( ( {props.cancelText} From 210f03d2cee4e1c54eb7bb5dd2aca34fa040d6a6 Mon Sep 17 00:00:00 2001 From: Sameera Madushan Date: Wed, 24 Mar 2021 00:58:02 +0530 Subject: [PATCH 8/8] Revert "Updating react-native-web to v15" This reverts commit f16ff72d77da67c4707f29cf95266aee2a636bde. --- package-lock.json | 44 ++++++++-------------------------- package.json | 2 +- src/components/ConfirmModal.js | 2 -- 3 files changed, 11 insertions(+), 37 deletions(-) diff --git a/package-lock.json b/package-lock.json index e08057d59e82..55270dbd72db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12628,9 +12628,9 @@ "dev": true }, "inline-style-prefixer": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-6.0.0.tgz", - "integrity": "sha512-XTHvRUS4ZJNzC1GixJRmOlWSS45fSt+DJoyQC9ytj0WxQfcgofQtDtyKKYxHUqEsWCs+LIWftPF1ie7+i012Fg==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-5.1.2.tgz", + "integrity": "sha512-PYUF+94gDfhy+LsQxM0g3d6Hge4l1pAqOSOiZuHWzMvQEGsbRQ/ck2WioLqrY2ZkHyPgVUXxn+hrkF7D6QUGbA==", "requires": { "css-in-js-utils": "^2.0.0" } @@ -21457,43 +21457,19 @@ } }, "react-native-web": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.15.0.tgz", - "integrity": "sha512-42Ax8MyQ8FX2t4iJC2i091IIlXR1KuQn4lPvX+dm1K86Z6uuibwRZgJOxUBsQZJqdLrZQ9qeknJsGErOcJgaOg==", + "version": "0.14.10", + "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.14.10.tgz", + "integrity": "sha512-YTvYnUUPnOjU50GiXk90cm6atk714vF8p7HhBlqHtLtftHk9xQRwgxXzoMHiKf0Bx20Dyo2SGvv4XrPxcmEheQ==", "requires": { "array-find-index": "^1.0.2", - "create-react-class": "^15.7.0", + "create-react-class": "^15.6.2", "deep-assign": "^3.0.0", - "fbjs": "^3.0.0", - "hyphenate-style-name": "^1.0.4", - "inline-style-prefixer": "^6.0.0", + "fbjs": "^1.0.0", + "hyphenate-style-name": "^1.0.3", + "inline-style-prefixer": "^5.1.0", "normalize-css-color": "^1.0.2", "prop-types": "^15.6.0", "react-timer-mixin": "^0.13.4" - }, - "dependencies": { - "fbjs": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.0.tgz", - "integrity": "sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg==", - "requires": { - "cross-fetch": "^3.0.4", - "fbjs-css-vars": "^1.0.0", - "loose-envify": "^1.0.0", - "object-assign": "^4.1.0", - "promise": "^7.1.1", - "setimmediate": "^1.0.5", - "ua-parser-js": "^0.7.18" - } - }, - "promise": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", - "requires": { - "asap": "~2.0.3" - } - } } }, "react-pdf": { diff --git a/package.json b/package.json index e6f3ea21c297..92149bd3ef0d 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "react-native-safe-area-context": "^3.1.4", "react-native-screens": "2.17.1", "react-native-svg": "^12.1.0", - "react-native-web": "^0.15.0", + "react-native-web": "^0.14.1", "react-pdf": "^5.2.0", "react-web-config": "^1.0.0", "rn-fetch-blob": "^0.12.0", diff --git a/src/components/ConfirmModal.js b/src/components/ConfirmModal.js index 49822433cf85..2e10bb1fddf0 100644 --- a/src/components/ConfirmModal.js +++ b/src/components/ConfirmModal.js @@ -61,7 +61,6 @@ const ConfirmModal = props => ( ( {props.cancelText}