Cleanup

src/front/shared/components/Header/Logo/Logo.tsx

@@ -7,7 +7,6 @@ import { links, constants } from 'helpers'
 import CSSModules from 'react-css-modules'
 import styles from './Logo.scss'
 
-import { localisedUrl } from 'helpers/locale'
 import ThemeTooltip from '../../ui/Tooltip/ThemeTooltip'
 
 import logoBlack from 'shared/images/logo/logo-black.svg'
@@ -53,10 +52,7 @@ class Logo extends Component<any, {}> {
 
     const imgAlt = window.location.hostname
 
-    const goToUrl = isCustomLogoLink ?
-      customLogoLink
-      :
-      localisedUrl(locale, links.home);
+    const goToUrl = isCustomLogoLink ? customLogoLink : links.home
 
     return (
       <div styleName="logoWrapper">

src/front/shared/helpers/cache.ts

@@ -1,5 +1,4 @@
-import getUnixTimeStamp from './getUnixTimeStamp'
-
+import getUnixTimeStamp from 'common/utils/getUnixTimeStamp'
 
 const cacheStorage = {}
 

src/front/shared/helpers/index.ts

@@ -5,7 +5,6 @@ import eth from './eth'
 import bnb from './bnb'
 import matic from './matic'
 import ethToken from './ethToken'
-import bepToken from './bepToken'
 import * as user from './user'
 import web3 from './web3'
 import links from './links'
@@ -25,7 +24,6 @@ import transactions from './transactions'
 
 import { migrate } from './migrations/'
 
-import getUnixTimeStamp from './getUnixTimeStamp'
 import { cacheStorageGet, cacheStorageSet } from './cache'
 
 import apiLooper from './apiLooper'
@@ -55,7 +53,6 @@ export default {
   ghost,
   next,
   ethToken,
-  bepToken,
   getCurrencyKey,
   handleGoTrade,
   transactions,
@@ -69,7 +66,6 @@ export {
   ghost,
   next,
   ethToken,
-  bepToken,
   user,
   web3,
   utils,
@@ -87,7 +83,6 @@ export {
   externalConfig,
 
   feedback,
-  getUnixTimeStamp,
   cacheStorageGet,
   cacheStorageSet,
 

src/front/shared/helpers/links.ts

@@ -26,7 +26,6 @@ const linksManager = {
   atomicSwap: '/atomic-swaps',
   turboSwap: '/turbo-swaps',
   feed: '/feed',
-  aboutUs: '/aboutUs',
   test: 'https://testnet.swaponline.io',
   main: 'https://swaponline.io/',
   wallet: '/wallet',

src/front/shared/helpers/lsDataCache.ts

@@ -1,5 +1,4 @@
-import getUnixTimeStamp from './getUnixTimeStamp'
-
+import getUnixTimeStamp from 'common/utils/getUnixTimeStamp'
 
 const localStorage = window.localStorage
 

src/front/shared/helpers/seo.ts

@@ -3,7 +3,7 @@ const seo = {
     medium: 'https://medium.com/@swaponline',
     twitter: 'https://twitter.com/SwapOnlineTeam',
     facebook: 'https://www.facebook.com/SwapOnlineTeam',
-    telegram: 'https://t.me/swaponlineint',
+    telegram: 'https://t.me/swaponline',
     email: '[email protected]',
     mainUrl: 'https://swaponline.io',
     logo: 'https://screenshots.wpmix.net/chrome_2019-03-28_18-55-506746c4c5-44e6-4bb5-89cb-52ce8fabcedf.png',
@@ -55,11 +55,6 @@ const seo = {
       title: 'Transactions',
       description: 'Transactions',
     },
-    {
-      uri: '/aboutus',
-      title: 'About Us',
-      description: 'About Us',
-    },
     {
       uri: '/swap',
       title: 'Swap',

src/front/shared/localisation/en.json

@@ -1,8 +1,4 @@
 [
-  {
-    "id": "menu.aboutus",
-    "message": "About Us"
-  },
   {
     "id": "menu.exchange",
     "message": "Exchange",

src/front/shared/localisation/es.json

@@ -1,8 +1,4 @@
 [
-  {
-    "id": "menu.aboutus",
-    "message": "Quienes Somos"
-  },
   {
     "id": "menu.exchange",
     "message": "Intercambio",

src/front/shared/localisation/pl.json

@@ -1,8 +1,4 @@
 [
-  {
-    "id": "menu.aboutus",
-    "message": "O nas"
-  },
   {
     "id": "menu.exchange",
     "message": "Giełda",

src/front/shared/localisation/ru.json

@@ -1,8 +1,4 @@
 [
-  {
-    "id": "menu.aboutus",
-    "message": "О Нас"
-  },
   {
     "id": "menu.exchange",
     "message": "Обмен",

src/front/shared/pages/CreateWallet/CreateWallet.scss

@@ -49,20 +49,14 @@
   height: 40px;
   opacity: 0.7;
   transform: scale(0.6) translate(10px, -3px);
-  right: 15px;
+  right: 20px;
   position: absolute;
-  top: 10px;
+  top: 15px;
   z-index: 9999;
 
   div {
     overflow: visible;
   }
-
-  @media all and (max-width: 480px) {
-    position: fixed;
-    right: 1em;
-    top: 0.5em;
-  }
 }
 
 .isExist {

src/front/shared/pages/CreateWallet/Steps/SecondStep.tsx

@@ -8,7 +8,6 @@ import { isMobile } from 'react-device-detect'
 
 import actions from 'redux/actions'
 import { constants } from 'helpers'
-import ethToken from 'helpers/ethToken'
 import feedback from 'shared/helpers/feedback'
 import Explanation from '../Explanation'
 import icons from '../images'

src/front/shared/pages/CreateWallet/Steps/StepsWrapper.tsx

@@ -146,6 +146,7 @@ export default class StepsWrapper extends Component<any, any> {
               currencies={currenciesForSecondStep}
               setError={setError}
               handleClick={this.handleClick}
+              btcData={btcData}
               forcedCurrencyData
             />
           : (

src/front/shared/pages/Exchange/Orders/OrderBook/Row/Row.tsx

@@ -7,7 +7,7 @@ import actions from 'redux/actions'
 import styles from './Row.scss'
 import config from 'app-config'
 
-import helpers, { links, constants, ethToken } from 'helpers'
+import helpers, { links, constants } from 'helpers'
 import { IPairFees } from 'helpers/getPairFees'
 import PAIR_TYPES from 'helpers/constants/PAIR_TYPES'
 import { localisedUrl } from 'helpers/locale'

src/front/shared/redux/actions/backupManager.ts

@@ -1,13 +1,17 @@
 import constants from 'helpers/constants'
-import getUnixTimeStamp from 'helpers/getUnixTimeStamp'
+import getUnixTimeStamp from 'common/utils/getUnixTimeStamp'
 import config from 'helpers/externalConfig'
 import backupUserData from 'plugins/backupUserData'
 
 
 const backupFields = [
   constants.privateKeyNames.btcMnemonic,
   constants.privateKeyNames.ethMnemonic,
+  constants.privateKeyNames.bnbMnemonic,
+  constants.privateKeyNames.maticMnemonic,
   constants.privateKeyNames.eth,
+  constants.privateKeyNames.bnb,
+  constants.privateKeyNames.matic,
   constants.privateKeyNames.btc,
   constants.privateKeyNames.btcMultisig,
   constants.privateKeyNames.btcMultisigOtherOwnerKey,

src/front/shared/redux/actions/btc.ts

@@ -153,8 +153,7 @@ const login = (
 
     //@ts-ignore: strictNullChecks
     const accData = getWalletByWords(mnemonic)
-    console.log('Btc. Generated wallet from random 12 words')
-    console.log(accData)
+
     privateKey = accData.WIF
     localStorage.setItem(constants.privateKeyNames.btcMnemonic, privateKey)
   }
@@ -170,7 +169,6 @@ const login = (
   window.getBtcAddress = () => data.address
   window.getBtcData = () => data
 
-  console.info('Logged in with Bitcoin', data)
   reducers.user.setAuthData({ name: 'btcData', data })
   if (!sweepToMnemonicReady) {
     // Auth with our mnemonic account
@@ -192,7 +190,7 @@ const login = (
       ...auth(mnemonicKeys.btc),
       isMnemonic: true,
     }
-    console.info('Logged in with Bitcoin Mnemonic', mnemonicData)
+
     reducers.user.addWallet({
       name: 'btcMnemonicData',
       data: {

src/front/shared/redux/actions/btcmultisig.ts

@@ -346,7 +346,6 @@ const createWallet = (privateKey, otherOwnerPublicKey) => {
   window.getBtcMultisigData = () => data
   window.getBtcMultisigAddress = () => data.address
 
-  console.info('Logged in with BitcoinMultisig', data)
   reducers.user.setAuthData({ name: 'btcMultisigData', data })
 }
 

src/front/shared/redux/actions/ghost.ts

@@ -155,8 +155,7 @@ const login = (
 
     //@ts-ignore: strictNullChecks
     const accData = getWalletByWords(mnemonic)
-    console.log('Ghost. Generated wallet from random 12 words')
-    console.log(accData)
+
     privateKey = accData.WIF
     localStorage.setItem(constants.privateKeyNames.ghostMnemonic, privateKey)
   }
@@ -173,7 +172,6 @@ const login = (
   window.getGhostAddress = () => data.address
   window.getGhostData = () => data
 
-  console.info('Logged in with Ghost', data)
   reducers.user.setAuthData({ name: 'ghostData', data })
   if (!sweepToMnemonicReady) {
     // Auth with our mnemonic account
@@ -195,7 +193,7 @@ const login = (
       ...auth(mnemonicKeys.ghost),
       isMnemonic: true,
     }
-    console.info('Logged in with Ghost Mnemonic', mnemonicData)
+
     reducers.user.addWallet({
       name: 'ghostMnemonicData',
       data: {

src/front/shared/redux/actions/next.ts

@@ -153,8 +153,7 @@ const login = (
 
     //@ts-ignore: strictNullChecks
     const accData = getWalletByWords(mnemonic)
-    console.log('Next. Generated wallet from random 12 words')
-    console.log(accData)
+
     privateKey = accData.WIF
     localStorage.setItem(constants.privateKeyNames.nextMnemonic, privateKey)
   }
@@ -171,7 +170,6 @@ const login = (
   window.getNextAddress = () => data.address
   window.getNextData = () => data
 
-  console.info('Logged in with Next', data)
   reducers.user.setAuthData({
     name: 'nextData',
     data,
@@ -194,7 +192,7 @@ const login = (
       ...auth(mnemonicKeys.next),
       isMnemonic: true,
     }
-    console.info('Logged in with Next Mnemonic', mnemonicData)
+
     reducers.user.addWallet({
       name: 'nextMnemonicData',
       data: {

src/front/shared/redux/actions/usdt.ts

@@ -36,7 +36,6 @@ const login = (privateKey) => {
     publicKey,
   }
 
-  console.info('Logged in with USDT', data)
   reducers.user.setAuthData({ name: 'usdtData', data })
 }
 

src/front/shared/redux/actions/user.ts

@@ -81,7 +81,6 @@ const sign_btc_pin = async (btcPrivateKey) => {
     btcPinPublicKeys.push(btcPinMnemonicKey[0])
   }
 
-  console.log('sign to btc pin', btcPinPublicKeys)
   const _btcMultisigPinPrivateKey = actions.btcmultisig.login_PIN(btcPrivateKey, btcPinPublicKeys)
 }
 
@@ -105,7 +104,6 @@ const sign = async () => {
       ghost: localStorage.getItem(constants.privateKeyNames.ghostMnemonic),
       next: localStorage.getItem(constants.privateKeyNames.nextMnemonic),
     }
-    console.log('actions user - sign', mnemonicKeys, mnemonic)
 
     if (mnemonic !== `-`) {
       //@ts-ignore

src/front/shared/routes/index.tsx

@@ -10,7 +10,6 @@ import TurboSwap from 'pages/TurboSwap/TurboSwap'
 import History from 'pages/History/History'
 import CreateWallet from 'pages/CreateWallet/CreateWallet'
 import NotFound from 'pages/NotFound/NotFound'
-import About from 'pages/About/About'
 import Wallet from 'pages/Wallet/Wallet'
 import Currency from 'pages/Currency/Currency'
 import Exchange from 'pages/Exchange/Exchange'
@@ -52,7 +51,6 @@ const routes = (
       <Route path={`${links.exchange}`} component={Exchange} />
 
       <Route path={`${links.localStorage}`} component={LocalStorage} />
-      <Route path={`${links.aboutUs}`} component={About} />
 
       <Route path={`${links.send}/:currency/:address/:amount`} component={Wallet} />
       <Route path={`${links.wallet}`} component={Wallet} />