From a7e8943e5172247bb65fcb5211e11bda2c82c445 Mon Sep 17 00:00:00 2001
From: NotEternal <cent1pede@protonmail.ch>
Date: Fri, 18 Jun 2021 09:28:51 -0500
Subject: [PATCH 1/3] Delete an About page

---
 src/front/shared/helpers/links.ts      |  1 -
 src/front/shared/helpers/seo.ts        |  7 +------
 src/front/shared/localisation/en.json  |  4 ----
 src/front/shared/localisation/es.json  |  4 ----
 src/front/shared/localisation/pl.json  |  4 ----
 src/front/shared/localisation/ru.json  |  4 ----
 src/front/shared/pages/About/About.tsx | 17 -----------------
 src/front/shared/routes/index.tsx      |  2 --
 8 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 src/front/shared/pages/About/About.tsx

diff --git a/src/front/shared/helpers/links.ts b/src/front/shared/helpers/links.ts
index aadbbcea00..70f998bca1 100644
--- a/src/front/shared/helpers/links.ts
+++ b/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',
diff --git a/src/front/shared/helpers/seo.ts b/src/front/shared/helpers/seo.ts
index c8b07f06fb..ff8d0382ce 100644
--- a/src/front/shared/helpers/seo.ts
+++ b/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: 'info@swaponline.io',
     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',
diff --git a/src/front/shared/localisation/en.json b/src/front/shared/localisation/en.json
index c3bfb50e7b..672b740ba4 100644
--- a/src/front/shared/localisation/en.json
+++ b/src/front/shared/localisation/en.json
@@ -1,8 +1,4 @@
 [
-  {
-    "id": "menu.aboutus",
-    "message": "About Us"
-  },
   {
     "id": "menu.exchange",
     "message": "Exchange",
diff --git a/src/front/shared/localisation/es.json b/src/front/shared/localisation/es.json
index 614872f10c..1eb563974e 100644
--- a/src/front/shared/localisation/es.json
+++ b/src/front/shared/localisation/es.json
@@ -1,8 +1,4 @@
 [
-  {
-    "id": "menu.aboutus",
-    "message": "Quienes Somos"
-  },
   {
     "id": "menu.exchange",
     "message": "Intercambio",
diff --git a/src/front/shared/localisation/pl.json b/src/front/shared/localisation/pl.json
index f641189edf..21246d1f0b 100644
--- a/src/front/shared/localisation/pl.json
+++ b/src/front/shared/localisation/pl.json
@@ -1,8 +1,4 @@
 [
-  {
-    "id": "menu.aboutus",
-    "message": "O nas"
-  },
   {
     "id": "menu.exchange",
     "message": "Giełda",
diff --git a/src/front/shared/localisation/ru.json b/src/front/shared/localisation/ru.json
index e5f05a57ed..dc89e2df0a 100644
--- a/src/front/shared/localisation/ru.json
+++ b/src/front/shared/localisation/ru.json
@@ -1,8 +1,4 @@
 [
-  {
-    "id": "menu.aboutus",
-    "message": "О Нас"
-  },
   {
     "id": "menu.exchange",
     "message": "Обмен",
diff --git a/src/front/shared/pages/About/About.tsx b/src/front/shared/pages/About/About.tsx
deleted file mode 100644
index 093037cc4b..0000000000
--- a/src/front/shared/pages/About/About.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react'
-import { connect } from 'redaction'
-
-import PageHeadline from 'components/PageHeadline/PageHeadline'
-import SubTitle from 'components/PageHeadline/SubTitle/SubTitle'
-import { FormattedMessage } from 'react-intl'
-
-
-const About = ({ address }) => (
-  <section style={{ height: '100%' }}>
-    <iframe width="100%" height="750px" style={{ marginTop: '30px' }} title="wiki.swaponline.io" src={` https://wiki.swaponline.io/about-swap-online/`} frameBorder="0" />
-  </section>
-)
-
-export default connect(state => ({
-  address: state.user.ethData.address,
-}))(About)
diff --git a/src/front/shared/routes/index.tsx b/src/front/shared/routes/index.tsx
index 9b3248eae7..49b1068464 100644
--- a/src/front/shared/routes/index.tsx
+++ b/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} />

From 04baec5796aa22bd2851876ed0050d99eb156136 Mon Sep 17 00:00:00 2001
From: NotEternal <cent1pede@protonmail.ch>
Date: Sun, 20 Jun 2021 07:54:07 -0500
Subject: [PATCH 2/3] Delete private logs. Improve close button display in the
 Create wallet modal. Delete bepToken helpers from the front helpers

---
 .../shared/components/Header/Logo/Logo.tsx    |  6 +---
 src/front/shared/helpers/bepToken.ts          | 30 -------------------
 src/front/shared/helpers/index.ts             |  3 --
 .../pages/CreateWallet/CreateWallet.scss      | 10 ++-----
 .../pages/CreateWallet/Steps/SecondStep.tsx   |  1 -
 .../pages/CreateWallet/Steps/StepsWrapper.tsx |  1 +
 .../Exchange/Orders/OrderBook/Row/Row.tsx     |  2 +-
 src/front/shared/redux/actions/btc.ts         |  6 ++--
 src/front/shared/redux/actions/btcmultisig.ts |  1 -
 src/front/shared/redux/actions/ghost.ts       |  6 ++--
 src/front/shared/redux/actions/next.ts        |  6 ++--
 src/front/shared/redux/actions/usdt.ts        |  1 -
 src/front/shared/redux/actions/user.ts        |  2 --
 13 files changed, 11 insertions(+), 64 deletions(-)
 delete mode 100644 src/front/shared/helpers/bepToken.ts

diff --git a/src/front/shared/components/Header/Logo/Logo.tsx b/src/front/shared/components/Header/Logo/Logo.tsx
index 85637fbcd7..bb13e956a2 100644
--- a/src/front/shared/components/Header/Logo/Logo.tsx
+++ b/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">
diff --git a/src/front/shared/helpers/bepToken.ts b/src/front/shared/helpers/bepToken.ts
deleted file mode 100644
index a9dd948f59..0000000000
--- a/src/front/shared/helpers/bepToken.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import config from './externalConfig'
-import erc20Like from 'common/erc20Like'
-
-// TODO: =================================
-
-// ! Deprecated. Use common/erc20Like
-
-// TODO: =================================
-
-const isEthOrEthToken = ({ name }) => Object.keys(config.erc20).concat('eth').includes(name.toLowerCase())
-
-type EstimateFeeOptions = {
-  method: string
-  swapABMethod?: 'withdraw' | 'deposit'
-  speed: 'fast' | 'normal' | 'slow'
-}
-
-const estimateFeeValue = async (options: EstimateFeeOptions) => {
-  return erc20Like.bep20.estimateFeeValue(options)
-}
-
-const estimateGasPrice = (params) => {
-  return erc20Like.bep20.estimateFeeValue(params)
-}
-
-export default {
-  estimateFeeValue,
-  estimateGasPrice,
-  isEthOrEthToken,
-}
diff --git a/src/front/shared/helpers/index.ts b/src/front/shared/helpers/index.ts
index d7cb3034f3..b53e2e5aab 100644
--- a/src/front/shared/helpers/index.ts
+++ b/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'
@@ -55,7 +54,6 @@ export default {
   ghost,
   next,
   ethToken,
-  bepToken,
   getCurrencyKey,
   handleGoTrade,
   transactions,
@@ -69,7 +67,6 @@ export {
   ghost,
   next,
   ethToken,
-  bepToken,
   user,
   web3,
   utils,
diff --git a/src/front/shared/pages/CreateWallet/CreateWallet.scss b/src/front/shared/pages/CreateWallet/CreateWallet.scss
index e5846981b1..674cc86fef 100644
--- a/src/front/shared/pages/CreateWallet/CreateWallet.scss
+++ b/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 {
diff --git a/src/front/shared/pages/CreateWallet/Steps/SecondStep.tsx b/src/front/shared/pages/CreateWallet/Steps/SecondStep.tsx
index 11c3d5c761..33f8e45d8d 100644
--- a/src/front/shared/pages/CreateWallet/Steps/SecondStep.tsx
+++ b/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'
diff --git a/src/front/shared/pages/CreateWallet/Steps/StepsWrapper.tsx b/src/front/shared/pages/CreateWallet/Steps/StepsWrapper.tsx
index db190d21ea..b382d63652 100644
--- a/src/front/shared/pages/CreateWallet/Steps/StepsWrapper.tsx
+++ b/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
             />
           : (
diff --git a/src/front/shared/pages/Exchange/Orders/OrderBook/Row/Row.tsx b/src/front/shared/pages/Exchange/Orders/OrderBook/Row/Row.tsx
index 99e52e2478..4b4956933a 100644
--- a/src/front/shared/pages/Exchange/Orders/OrderBook/Row/Row.tsx
+++ b/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'
diff --git a/src/front/shared/redux/actions/btc.ts b/src/front/shared/redux/actions/btc.ts
index 801a50e808..dd65eaa56b 100644
--- a/src/front/shared/redux/actions/btc.ts
+++ b/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: {
diff --git a/src/front/shared/redux/actions/btcmultisig.ts b/src/front/shared/redux/actions/btcmultisig.ts
index b5ae70b05d..2ff0343b33 100644
--- a/src/front/shared/redux/actions/btcmultisig.ts
+++ b/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 })
 }
 
diff --git a/src/front/shared/redux/actions/ghost.ts b/src/front/shared/redux/actions/ghost.ts
index 929c46d629..d114eb43e2 100644
--- a/src/front/shared/redux/actions/ghost.ts
+++ b/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: {
diff --git a/src/front/shared/redux/actions/next.ts b/src/front/shared/redux/actions/next.ts
index d5c8ec38e2..4d211d7de3 100644
--- a/src/front/shared/redux/actions/next.ts
+++ b/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: {
diff --git a/src/front/shared/redux/actions/usdt.ts b/src/front/shared/redux/actions/usdt.ts
index ae2a0eccd4..6a0001bcc4 100644
--- a/src/front/shared/redux/actions/usdt.ts
+++ b/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 })
 }
 
diff --git a/src/front/shared/redux/actions/user.ts b/src/front/shared/redux/actions/user.ts
index 9f140b3886..34fce9b7b9 100644
--- a/src/front/shared/redux/actions/user.ts
+++ b/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

From 52a790504d38ed9aca12bf1d063d551ed1f99336 Mon Sep 17 00:00:00 2001
From: NotEternal <cent1pede@protonmail.ch>
Date: Sun, 20 Jun 2021 08:04:05 -0500
Subject: [PATCH 3/3] Delete time stamp helper from the front side

---
 src/front/shared/helpers/cache.ts               | 3 +--
 src/front/shared/helpers/getUnixTimeStamp.ts    | 4 ----
 src/front/shared/helpers/index.ts               | 2 --
 src/front/shared/helpers/lsDataCache.ts         | 3 +--
 src/front/shared/redux/actions/backupManager.ts | 6 +++++-
 5 files changed, 7 insertions(+), 11 deletions(-)
 delete mode 100644 src/front/shared/helpers/getUnixTimeStamp.ts

diff --git a/src/front/shared/helpers/cache.ts b/src/front/shared/helpers/cache.ts
index f33dcb785d..6828719c84 100644
--- a/src/front/shared/helpers/cache.ts
+++ b/src/front/shared/helpers/cache.ts
@@ -1,5 +1,4 @@
-import getUnixTimeStamp from './getUnixTimeStamp'
-
+import getUnixTimeStamp from 'common/utils/getUnixTimeStamp'
 
 const cacheStorage = {}
 
diff --git a/src/front/shared/helpers/getUnixTimeStamp.ts b/src/front/shared/helpers/getUnixTimeStamp.ts
deleted file mode 100644
index e1ec4c0ea8..0000000000
--- a/src/front/shared/helpers/getUnixTimeStamp.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import getUnixTimeStamp from '../../../common/utils/getUnixTimeStamp'
-
-
-export default getUnixTimeStamp
diff --git a/src/front/shared/helpers/index.ts b/src/front/shared/helpers/index.ts
index b53e2e5aab..eb11c583d6 100644
--- a/src/front/shared/helpers/index.ts
+++ b/src/front/shared/helpers/index.ts
@@ -24,7 +24,6 @@ import transactions from './transactions'
 
 import { migrate } from './migrations/'
 
-import getUnixTimeStamp from './getUnixTimeStamp'
 import { cacheStorageGet, cacheStorageSet } from './cache'
 
 import apiLooper from './apiLooper'
@@ -84,7 +83,6 @@ export {
   externalConfig,
 
   feedback,
-  getUnixTimeStamp,
   cacheStorageGet,
   cacheStorageSet,
 
diff --git a/src/front/shared/helpers/lsDataCache.ts b/src/front/shared/helpers/lsDataCache.ts
index bb39469d69..e04cd3d911 100644
--- a/src/front/shared/helpers/lsDataCache.ts
+++ b/src/front/shared/helpers/lsDataCache.ts
@@ -1,5 +1,4 @@
-import getUnixTimeStamp from './getUnixTimeStamp'
-
+import getUnixTimeStamp from 'common/utils/getUnixTimeStamp'
 
 const localStorage = window.localStorage
 
diff --git a/src/front/shared/redux/actions/backupManager.ts b/src/front/shared/redux/actions/backupManager.ts
index bdf1d3208d..cb7db86da6 100644
--- a/src/front/shared/redux/actions/backupManager.ts
+++ b/src/front/shared/redux/actions/backupManager.ts
@@ -1,5 +1,5 @@
 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'
 
@@ -7,7 +7,11 @@ 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,