Cleanup

docs/CORE.md

@@ -1,5 +1,3 @@
-<img src="https://api.travis-ci.org/caffeinum/swap.core.svg?branch=master" />
-
 # Swap Core (`src/core`)
 
 In-browser atomic swap protocol based on HTLC

src/front/client/scss/fonts/_manrope.scss

@@ -30,19 +30,3 @@
   font-weight: 400;
   font-style: normal;
 }
-
-// @font-face {
-//   font-family: 'Inter-SemiBold';
-//   src: url('../fonts/Inter/Inter-SemiBold.woff2') format('woff2'),
-//   url('../fonts/Inter/Inter-SemiBold.woff') format('woff');
-//   font-weight: 400;
-//   font-style: normal;
-// }
-
-// @font-face {
-//   font-family: 'Inter-Bold';
-//   src: url('../fonts/Inter/Inter-Bold.woff2') format('woff2'),
-//   url('../fonts/Inter/Inter-Bold.woff') format('woff');
-//   font-weight: 400;
-//   font-style: normal;
-// }

src/front/shared/components/Comment/Comment.scss

@@ -6,7 +6,7 @@
 .date {
   font-size: 12px;
   font-weight: bold;
-  font-family: 'Inter-Regular', sans-serif;
+  font-family: Roboto, sans-serif;
   color: #8E9AA3;
   white-space: pre-wrap;
   cursor: pointer;
@@ -40,7 +40,7 @@
 
   textarea {
     width: 85%;
-    font-family: 'Inter-Regular', sans-serif;
+    font-family: Roboto, sans-serif;
   }
 
   .submit {

src/front/shared/components/Footer/Links/Links.tsx

@@ -34,8 +34,6 @@ const link = [
     { link: links.footer.fordexses, title: <FormattedMessage id="FooterPartnershipForDEXes" defaultMessage="For DEXes" /> },
     /* Блокчейнам (For Blockchains) https://wiki.swap.online/for_blockchains/ */
     { link: links.footer.forblockchains, title: <FormattedMessage id="FooterPartnershipForBlockchains" defaultMessage="For Blockchains" /> },
-    /* Токенам (For ERC20 tokens) https://listing.swap.online/ */
-    { link: links.footer.forerc20tokens, title: <FormattedMessage id="FooterPartnershipForERC20" defaultMessage="For ERC20 tokens" /> },
     /* Виджет для криптосайтов (For news websites) https://widget.swap.online/ */
     { link: links.footer.fornewswebsites, title: <FormattedMessage id="FooterPartnershipForNewsWebsites" defaultMessage="For news websites" /> },
   ],

src/front/shared/components/modals/AddCustomERC20/AddCustomERC20.tsx

@@ -1,6 +1,7 @@
 import React, { Fragment } from 'react'
 import PropTypes from 'prop-types'
-import helpers, { constants, request } from 'helpers'
+import helpers, { constants } from 'helpers'
+import request from 'common/utils/request'
 import actions from 'redux/actions'
 import Link from 'local_modules/sw-valuelink'
 import { connect } from 'redaction'

src/front/shared/components/modals/CurrencyAction/CurrencyAction.scss

@@ -105,7 +105,6 @@
     font-weight: 100;
     color: #8E9AA3;
     font-size: 11px;
-    font-family: Inter;
     line-height: 20px;
     text-align: center;
   }

src/front/shared/components/modals/InfoPay/InfoPay.tsx

@@ -7,7 +7,7 @@ import { getFullOrigin } from 'helpers/links'
 import cssModules from 'react-css-modules'
 import styles from './InfoPay.scss'
 import ShareButton from 'components/controls/ShareButton/ShareButton'
-import finishSvg from './images/finish.svg'
+import okSvg from 'shared/images/ok.svg'
 import actions from 'redux/actions'
 
 
@@ -130,7 +130,7 @@ export default class InfoPay extends React.Component<any, any> {
       <Modal name={name} title={intl.formatMessage(labels.Title)} onClose={this.handleClose} showCloseButton={true}>
         <div styleName="blockCenter">
           <div>
-            <img styleName="finishImg" src={finishSvg} alt="finish" />
+            <img styleName="finishImg" src={okSvg} alt="finish" />
           </div>
 
           <div className="p-3">

src/front/shared/components/modals/InvoiceModal/InvoiceModal.tsx

@@ -1,6 +1,7 @@
 import React, { Fragment } from 'react'
 import PropTypes from 'prop-types'
-import helpers, { request, constants } from 'helpers'
+import helpers, { constants } from 'helpers'
+import request from 'common/utils/request'
 import actions from 'redux/actions'
 import Link from 'local_modules/sw-valuelink'
 import { connect } from 'redaction'

src/front/shared/components/modals/OfferModal/AddOffer/AddOffer.tsx

@@ -21,11 +21,26 @@ import Toggle from 'components/controls/Toggle/Toggle'
 import Input from 'components/forms/Input/Input'
 import Tooltip from 'components/ui/Tooltip/Tooltip'
 import { FormattedMessage } from 'react-intl'
-import { isNumberValid, isNumberStringFormatCorrect, mathConstants } from 'helpers/math'
 import minAmountOffer from 'helpers/constants/minAmountOffer'
 import coinsWithDynamicFee from 'helpers/constants/coinsWithDynamicFee'
 
 
+const mathConstants = {
+  high_precision: 10e-8,
+  low_precision: 10e-5,
+}
+
+const isNumberStringFormatCorrect = number => {
+  const stringified = String(number)
+
+  const firstDotIndex = stringified.indexOf('.')
+  const lastDotIndex = stringified.lastIndexOf('.')
+
+  // first and last dot positions match, so it has only one dot
+  return firstDotIndex === lastDotIndex
+}
+
+
 const isDark = localStorage.getItem(constants.localStorage.isDark)
 @connect(
   ({

src/front/shared/components/modals/RegisterPINProtected/RegisterPINProtected.tsx

@@ -24,7 +24,7 @@ import typeforce from 'swap.app/util/typeforce'
 import { inputReplaceCommaWithDot } from 'helpers/domUtils'
 import CopyToClipboard from 'react-copy-to-clipboard'
 import moment from 'moment/moment'
-import finishSvg from './images/finish.svg'
+import okSvg from 'shared/images/ok.svg'
 
 const langPrefix = `RegisterPINProtectedBTC`
 
@@ -707,7 +707,7 @@ export default class RegisterPINProtected extends React.Component<any, any> {
             <Fragment>
               <div styleName="highLevel">
                 <div>
-                  <img styleName="finishImg" src={finishSvg} alt="finish" />
+                  <img styleName="finishImg" src={okSvg} alt="finish" />
                 </div>
                 <span
                   style={{

src/front/shared/components/modals/RegisterSMSProtected/RegisterSMSProtected.tsx

@@ -22,7 +22,7 @@ import typeforce from 'swap.app/util/typeforce'
 // import { isCoinAddress } from 'swap.app/util/typeforce'
 import CopyToClipboard from 'react-copy-to-clipboard'
 import moment from 'moment/moment'
-import finishSvg from './images/finish.svg'
+import okSvg from 'shared/images/ok.svg'
 
 @injectIntl
 @connect(({ user: { btcData, btcMultisigSMSData } }) => ({
@@ -762,7 +762,7 @@ export default class RegisterSMSProtected extends React.Component<any, any> {
             <Fragment>
               <div styleName="highLevel">
                 <div>
-                  <img styleName="finishImg" src={finishSvg} alt="finish" />
+                  <img styleName="finishImg" src={okSvg} alt="finish" />
                 </div>
                 <span
                   style={{

src/front/shared/components/modals/RestoryMnemonicWallet/RestoryMnemonicWallet.tsx

@@ -10,7 +10,7 @@ import cssModules from 'react-css-modules'
 
 import defaultStyles from '../Styles/default.scss'
 import styles from './RestoryMnemonicWallet.scss'
-import finishSvg from './images/finish.svg'
+import okSvg from 'shared/images/ok.svg'
 
 import { BigNumber } from 'bignumber.js'
 import Modal from 'components/modal/Modal/Modal'
@@ -311,7 +311,7 @@ export default class RestoryMnemonicWallet extends React.Component<any, any> {
           {step === `ready` && (
             <Fragment>
               <p styleName="notice mnemonicNotice">
-                <img styleName="finishImg" src={finishSvg} alt="finish" />
+                <img styleName="finishImg" src={okSvg} alt="finish" />
                 <FormattedMessage {...langLabels.readyNotice} />
               </p>
               <div styleName="lowLevel">

src/front/shared/components/modals/SaveMnemonicModal/SaveMnemonicModal.tsx

@@ -10,7 +10,7 @@ import cssModules from 'react-css-modules'
 
 import defaultStyles from '../Styles/default.scss'
 import styles from './SaveMnemonicModal.scss'
-import finishSvg from './images/finish.svg'
+import okSvg from 'shared/images/ok.svg'
 
 import { BigNumber } from 'bignumber.js'
 import Modal from 'components/modal/Modal/Modal'
@@ -302,7 +302,7 @@ export default class SaveMnemonicModal extends React.Component<any, any> {
           {step === `ready` && (
             <Fragment>
               <p styleName="notice mnemonicNotice">
-                <img styleName="finishImg" src={finishSvg} alt="finish" />
+                <img styleName="finishImg" src={okSvg} alt="finish" />
                 <FormattedMessage {...langLabels.readySaveNotice} />
               </p>
               <div styleName="lowLevel">