Browse Source

Merge pull request #170 from LN-Zap/fix/modal-close

fix(modal-close): move back to the thinner modal close icons
renovate/lint-staged-8.x
JimmyMow 7 years ago
committed by GitHub
parent
commit
a2179a1544
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      app/components/Contacts/ContactModal.js
  2. 4
      app/components/Form/Form.js
  3. 4
      app/components/ModalRoot/ModalRoot.js
  4. 5
      app/components/Wallet/ReceiveModal.js
  5. 4
      app/routes/activity/components/components/Modal/Modal.js

5
app/components/Contacts/ContactModal.js

@ -2,7 +2,8 @@ import React from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import find from 'lodash/find' import find from 'lodash/find'
import ReactModal from 'react-modal' import ReactModal from 'react-modal'
import { FaClose, FaCircle } from 'react-icons/lib/fa' import { FaCircle } from 'react-icons/lib/fa'
import { MdClose } from 'react-icons/lib/md'
import { btc } from 'utils' import { btc } from 'utils'
@ -64,7 +65,7 @@ const ContactModal = ({
</div> </div>
<div className={styles.closeContainer}> <div className={styles.closeContainer}>
<span onClick={closeContactModal}> <span onClick={closeContactModal}>
<FaClose /> <MdClose />
</span> </span>
</div> </div>
</header> </header>

4
app/components/Form/Form.js

@ -1,7 +1,7 @@
import React from 'react' import React from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { FaClose } from 'react-icons/lib/fa' import { MdClose } from 'react-icons/lib/md'
import PayForm from './PayForm' import PayForm from './PayForm'
import RequestForm from './RequestForm' import RequestForm from './RequestForm'
@ -21,7 +21,7 @@ const Form = ({ formType, formProps, closeForm }) => {
<div className={`${styles.outtercontainer} ${formType && styles.open}`}> <div className={`${styles.outtercontainer} ${formType && styles.open}`}>
<div className={styles.innercontainer}> <div className={styles.innercontainer}>
<div className={styles.esc} onClick={closeForm}> <div className={styles.esc} onClick={closeForm}>
<FaClose /> <MdClose />
</div> </div>
<div className={styles.content}> <div className={styles.content}>

4
app/components/ModalRoot/ModalRoot.js

@ -1,6 +1,6 @@
import React from 'react' import React from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { FaClose } from 'react-icons/lib/fa' import { MdClose } from 'react-icons/lib/md'
import SuccessfulSendCoins from './SuccessfulSendCoins' import SuccessfulSendCoins from './SuccessfulSendCoins'
import SuccessfulSendPayment from './SuccessfulSendPayment' import SuccessfulSendPayment from './SuccessfulSendPayment'
import WalletDetails from './WalletDetails' import WalletDetails from './WalletDetails'
@ -23,7 +23,7 @@ const ModalRoot = ({
<div className={styles.container}> <div className={styles.container}>
<div className={styles.content}> <div className={styles.content}>
<div className={styles.esc} onClick={hideModal}> <div className={styles.esc} onClick={hideModal}>
<FaClose /> <MdClose />
</div> </div>
<SpecificModal <SpecificModal

5
app/components/Wallet/ReceiveModal.js

@ -4,7 +4,8 @@ import ReactModal from 'react-modal'
import copy from 'copy-to-clipboard' import copy from 'copy-to-clipboard'
import QRCode from 'qrcode.react' import QRCode from 'qrcode.react'
import { showNotification } from 'notifications' import { showNotification } from 'notifications'
import { FaCopy, FaClose } from 'react-icons/lib/fa' import { FaCopy } from 'react-icons/lib/fa'
import { MdClose } from 'react-icons/lib/md'
import styles from './ReceiveModal.scss' import styles from './ReceiveModal.scss'
const ReceiveModal = ({ const ReceiveModal = ({
@ -43,7 +44,7 @@ const ReceiveModal = ({
> >
<div className={styles.closeContainer}> <div className={styles.closeContainer}>
<span onClick={() => hideActivityModal()}> <span onClick={() => hideActivityModal()}>
<FaClose /> <MdClose />
</span> </span>
</div> </div>

4
app/routes/activity/components/components/Modal/Modal.js

@ -1,7 +1,7 @@
import React from 'react' import React from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import ReactModal from 'react-modal' import ReactModal from 'react-modal'
import { FaClose } from 'react-icons/lib/fa' import { MdClose } from 'react-icons/lib/md'
import Transaction from './Transaction' import Transaction from './Transaction'
import Payment from './Payment' import Payment from './Payment'
@ -50,7 +50,7 @@ const Modal = ({
> >
<div className={styles.closeContainer}> <div className={styles.closeContainer}>
<span onClick={() => hideActivityModal()}> <span onClick={() => hideActivityModal()}>
<FaClose /> <MdClose />
</span> </span>
</div> </div>
<SpecificModal {...modalProps} ticker={ticker} currentTicker={currentTicker} /> <SpecificModal {...modalProps} ticker={ticker} currentTicker={currentTicker} />

Loading…
Cancel
Save