diff --git a/src/front/global.d.ts b/src/front/global.d.ts
index a660539110..9f1e821be4 100644
--- a/src/front/global.d.ts
+++ b/src/front/global.d.ts
@@ -2,23 +2,24 @@ import 'react'
 
 declare module 'react' {
   interface Attributes {
-    styleName?: string;
-    type?: string;
-    title?: any;
+    styleName?: string
+    type?: string
+    title?: any
+    alt?: string
   }
 }
 
 declare global {
   interface IEtheriumProvider {
-    [key: string]: any;
-    isLiquality?: boolean;
-    isTrust?: boolean;
-    isMetaMask?: boolean;
+    [key: string]: any
+    isLiquality?: boolean
+    isTrust?: boolean
+    isMetaMask?: boolean
   }
 
   interface Window {
-    [key: string]: any;
-    ethereum?: IEtheriumProvider;
+    [key: string]: any
+    ethereum?: IEtheriumProvider
   }
 
   interface Navigator {
diff --git a/src/front/shared/components/Avatar/Avatar.tsx b/src/front/shared/components/Avatar/Avatar.tsx
index bfffbf128b..cad20c56c7 100644
--- a/src/front/shared/components/Avatar/Avatar.tsx
+++ b/src/front/shared/components/Avatar/Avatar.tsx
@@ -1,5 +1,4 @@
 import React, { Fragment } from 'react'
-import PropTypes from 'prop-types'
 import config from 'helpers/externalConfig'
 
 import { toSvg } from 'jdenticon'
@@ -21,8 +20,17 @@ const hasGravatar = (ethAddress) => {
   return false
 }
 
-const Avatar = ({ value, className, size, ownerEthAddress }) => {
+type ComponentProps = {
+  value: string
+  size?: number
+  className?: string
+  ownerEthAddress?: string
+}
+
+const Avatar = (props: ComponentProps) => {
+  const { value, className, size = 35, ownerEthAddress } = props
   let avatarUrl = `data:image/svg+xml,${encodeURIComponent(toSvg(value, size))}`
+
   if (ownerEthAddress) {
     const gravatar = hasGravatar(ownerEthAddress)
     if (gravatar) {
@@ -42,15 +50,4 @@ const Avatar = ({ value, className, size, ownerEthAddress }) => {
   )
 }
 
-Avatar.defaultProps = {
-  size: 35,
-}
-
-Avatar.propTypes = {
-  value: PropTypes.string.isRequired,
-  size: PropTypes.number,
-  className: PropTypes.string,
-  ownerEthAddress: PropTypes.string,
-}
-
 export default CSSModules(Avatar, styles)
diff --git a/src/front/shared/components/Coins/Coins.tsx b/src/front/shared/components/Coins/Coins.tsx
index 3eec0232ce..6204e2fe15 100644
--- a/src/front/shared/components/Coins/Coins.tsx
+++ b/src/front/shared/components/Coins/Coins.tsx
@@ -1,27 +1,24 @@
 import React from 'react'
-import PropTypes from 'prop-types'
-
 import CSSModules from 'react-css-modules'
 import styles from './Coins.scss'
 
 import Coin from 'components/Coin/Coin'
 
-
-const Coins = ({ className, names, size }) => (
-  <div styleName="coins" className={className}>
-    <Coin name={names[0]} size={size} />
-    <Coin name={names[1]} size={size} />
-  </div>
-)
-
-Coins.defaultProps = {
-  size: 40,
+type ComponentProps = {
+  names: string[]
+  size?: number
+  className?: string
 }
 
-Coins.propTypes = {
-  names: PropTypes.array.isRequired,
-  size: PropTypes.number,
-  className: PropTypes.string,
+const Coins = (props: ComponentProps) => {
+  const { className, names, size = 40 } = props
+
+  return (
+    <div styleName="coins" className={className}>
+      <Coin name={names[0]} size={size} />
+      <Coin name={names[1]} size={size} />
+    </div>
+  )
 }
 
 export default CSSModules(Coins, styles)
diff --git a/src/front/shared/components/Confirm/Confirm.tsx b/src/front/shared/components/Confirm/Confirm.tsx
index 7ac0bcf27e..16f5fd002e 100644
--- a/src/front/shared/components/Confirm/Confirm.tsx
+++ b/src/front/shared/components/Confirm/Confirm.tsx
@@ -1,6 +1,4 @@
 import React from 'react'
-import PropTypes from 'prop-types'
-
 import cssModules from 'react-css-modules'
 import styles from './Confirm.scss'
 
@@ -9,33 +7,36 @@ import Button from 'components/controls/Button/Button'
 import Center from 'components/layout/Center/Center'
 import { FormattedMessage } from 'react-intl'
 
-const Confirm = ({ rootClassName, isConfirm, isReject, title, animation }) => (
-  <Center>
-    <div styleName={animation ? 'confirm animation' : 'confirm'} className={rootClassName}>
-      <SubTitle>{title}</SubTitle>
-      <div styleName="row">
-        <Button brand onClick={isConfirm}>
-          <h3>
-            <FormattedMessage id="Confirm20" defaultMessage="Yes" />
-          </h3>
-        </Button>
-        <Button brand onClick={isReject}>
-          <h3>
-            <FormattedMessage id="ConConfirm25firm20" defaultMessage="No" />
-          </h3>
-        </Button>
-      </div>
-    </div>
-  </Center>
-)
+type ComponentProps = {
+  rootClassName: string
+  isConfirm: () => void
+  isReject: () => void
+  title: () => JSX.Element
+  animation: boolean
+}
 
-Confirm.propTypes = {
-  Center: PropTypes.node,
-  rootClassName: PropTypes.string,
-  isConfirm: PropTypes.func.isRequired,
-  isReject: PropTypes.func.isRequired,
-  title: PropTypes.string.isRequired,
-  animation: PropTypes.bool,
+const Confirm = (props: ComponentProps) => {
+  const { rootClassName, isConfirm, isReject, title, animation } = props
+
+  return (
+    <Center>
+      <div styleName={animation ? 'confirm animation' : 'confirm'} className={rootClassName}>
+        <SubTitle>{title}</SubTitle>
+        <div styleName="row">
+          <Button brand onClick={isConfirm}>
+            <h3>
+              <FormattedMessage id="Confirm20" defaultMessage="Yes" />
+            </h3>
+          </Button>
+          <Button brand onClick={isReject}>
+            <h3>
+              <FormattedMessage id="ConConfirm25firm20" defaultMessage="No" />
+            </h3>
+          </Button>
+        </div>
+      </div>
+    </Center>
+  )
 }
 
 export default cssModules(Confirm, styles, { allowMultiple: true })
diff --git a/src/front/shared/components/FaqExpandableItem/FaqExpandableItem.tsx b/src/front/shared/components/FaqExpandableItem/FaqExpandableItem.tsx
index 2e41c04123..d8321b6bcc 100644
--- a/src/front/shared/components/FaqExpandableItem/FaqExpandableItem.tsx
+++ b/src/front/shared/components/FaqExpandableItem/FaqExpandableItem.tsx
@@ -1,22 +1,23 @@
 import React from 'react'
-import PropTypes from 'prop-types'
-
 import CSSModules from 'react-css-modules'
 import styles from './FaqExpandableItem.scss'
-
 import Href from 'components/Href/Href'
 
-const FaqExpandableItem = ({ link, question }) => (
-  <div styleName="container">
-    <Href tab={link} styleName="header" rel="noreferrer noopener">
-      {question}
-    </Href>
-  </div>
-)
+type ComponentProps = {
+  question: string
+  link: string
+}
+
+const FaqExpandableItem = (props: ComponentProps) => {
+  const { link, question } = props
 
-FaqExpandableItem.propTypes = {
-  question: PropTypes.string.isRequired,
-  link: PropTypes.string.isRequired,
+  return (
+    <div styleName="container">
+      <Href tab={link} styleName="header" rel="noreferrer noopener">
+        {question}
+      </Href>
+    </div>
+  )
 }
 
 export default CSSModules(FaqExpandableItem, styles)
diff --git a/src/front/shared/components/InvoiceInfoBlock/InvoiceInfoBlock.tsx b/src/front/shared/components/InvoiceInfoBlock/InvoiceInfoBlock.tsx
index 71958cf661..9fa9f8f2b8 100644
--- a/src/front/shared/components/InvoiceInfoBlock/InvoiceInfoBlock.tsx
+++ b/src/front/shared/components/InvoiceInfoBlock/InvoiceInfoBlock.tsx
@@ -1,18 +1,31 @@
 import React from 'react'
-import PropTypes from 'prop-types'
-
 import cssModules from 'react-css-modules'
 import styles from './InvoiceInfoBlock.scss'
 import { FormattedMessage } from 'react-intl'
 
+type ComponentProps = {
+  invoiceData: {
+    invoiceNumber: number
+    amount: number
+    id: number
+    destAddress: string
+    fromAddress: string
+    label: string
+    type: string
+  }
+}
 
-const InvoiceInfoBlock = (props) => {
+const InvoiceInfoBlock = (props: ComponentProps) => {
   const { invoiceData } = props
 
-  let bip0020link = `bitcoin:${(invoiceData.destination) ? invoiceData.destination : invoiceData.fromAddress}`
+  let bip0020link = `bitcoin:${(invoiceData.destAddress) ? invoiceData.destAddress : invoiceData.fromAddress}`
+
   bip0020link = `${bip0020link}?amount=${invoiceData.amount}`
   bip0020link = `${bip0020link}&label=Invoice-${invoiceData.id}-${invoiceData.invoiceNumber}`
-  if (invoiceData.label) bip0020link = `${bip0020link}&message=${encodeURI(invoiceData.label)}`
+
+  if (invoiceData.label) {
+    bip0020link = `${bip0020link}&message=${encodeURI(invoiceData.label)}`
+  }
 
   return (
     <div styleName="invoiceInfoBlock">
@@ -32,8 +45,4 @@ const InvoiceInfoBlock = (props) => {
   )
 }
 
-InvoiceInfoBlock.propTypes = {
-  invoiceData: PropTypes.object,
-}
-
 export default cssModules(InvoiceInfoBlock, styles, { allowMultiple: true })
diff --git a/src/front/shared/components/QR/QR.tsx b/src/front/shared/components/QR/QR.tsx
index 6ab85c186c..e024b1ff9a 100644
--- a/src/front/shared/components/QR/QR.tsx
+++ b/src/front/shared/components/QR/QR.tsx
@@ -1,17 +1,20 @@
 import React, { Component } from 'react'
 import CSSModules from 'react-css-modules'
 import cx from 'classnames'
-import PropTypes from 'prop-types'
-import InlineLoader from 'components/loaders/InlineLoader/InlineLoader'
 import animateFetching from 'components/loaders/ContentLoader/ElementLoading.scss'
 
 import styles from './QR.scss'
 
-/**
- * @todo Amount support?
- */
+type ComponentProps = {
+  address: string
+}
+
+type ComponentState = {
+  renderQr: boolean
+}
+
 @CSSModules({ ...styles, ...animateFetching }, { allowMultiple: true })
-export default class QR extends Component<any, any> {
+export default class QR extends Component<ComponentProps, ComponentState> {
 
   constructor(props) {
     super(props)
@@ -21,10 +24,6 @@ export default class QR extends Component<any, any> {
     }
   }
 
-  static propTypes = {
-    address: PropTypes.string.isRequired,
-  }
-
   componentDidMount() {
     setTimeout(() => {
       this.setState({ renderQr: true })
diff --git a/src/front/shared/components/Timer/Timer.ts b/src/front/shared/components/Timer/Timer.ts
index da16f1efc4..20fb901c07 100644
--- a/src/front/shared/components/Timer/Timer.ts
+++ b/src/front/shared/components/Timer/Timer.ts
@@ -1,25 +1,21 @@
-import React, { Component } from 'react'
+import { Component } from 'react'
 
-import PropTypes from 'prop-types'
-
-
-export default class TimerButton extends Component<any, any> {
-
-  static propTypes = {
-    timeLeft: PropTypes.number, // seconds
-    handleClick: PropTypes.func,
-  }
+type ComponentProps = {
+  timeLeft?: number // seconds
+  handleClick: () => void
+}
 
-  static defaultProps = {
-    timeLeft: 10,
-  }
+type ComponentState = {
+  timeLeft: number
+}
 
+export default class TimerButton extends Component<ComponentProps, ComponentState> {
   timer = null
 
   constructor(props) {
     super(props)
 
-    const { timeLeft } = props
+    const { timeLeft = 10 } = props
 
     this.state = {
       timeLeft,
diff --git a/src/front/shared/components/controls/Flip/Flip.tsx b/src/front/shared/components/controls/Flip/Flip.tsx
index 501933f9a5..21145f3a3b 100644
--- a/src/front/shared/components/controls/Flip/Flip.tsx
+++ b/src/front/shared/components/controls/Flip/Flip.tsx
@@ -1,23 +1,23 @@
 import React from 'react'
-import PropTypes from 'prop-types'
-
 import CSSModules from 'react-css-modules'
 import styles from './Flip.scss'
 
-
-const Flip = ({ onClick, className }) => (
-  //@ts-ignore 
-  <button alt="flip currency" onClick={onClick} className={className} styleName="trade-panel__change" />
-)
-
-Flip.propTypes = {
-  onClick: PropTypes.func,
-  className: PropTypes.string,
+type ComponentProps = {
+  onClick: () => void
+  className?: string
 }
 
-Flip.defaulProps = {
-  className: '',
-}
+const Flip = (props: ComponentProps) => {
+  const { onClick, className = '' } = props
 
+  return (
+    <button
+      alt="flip currency"
+      onClick={onClick}
+      className={className}
+      styleName="trade-panel__change"
+    />
+  )
+}
 
 export default CSSModules(Flip, styles)
diff --git a/src/front/shared/components/controls/Toggle/Toggle.tsx b/src/front/shared/components/controls/Toggle/Toggle.tsx
index df54698e4c..190d36e27a 100644
--- a/src/front/shared/components/controls/Toggle/Toggle.tsx
+++ b/src/front/shared/components/controls/Toggle/Toggle.tsx
@@ -1,20 +1,23 @@
 import React from 'react'
-import PropTypes from 'prop-types'
-
 import CSSModules from 'react-css-modules'
 import styles from './Toggle.scss'
 
+type ComponentProps = {
+  checked: boolean
+  onChange: (arg: boolean) => void
+  dataTut?: string
+  isDisabled?: boolean
+}
 
-const Toggle = ({ checked, onChange, dataTut = null, isDisabled = false }) => (
-  <label styleName={`Switch ${isDisabled ? 'disabled' : ''}`} data-tut={dataTut} >
-    <input type="checkbox" onChange={({ target }) => onChange(target.checked)} checked={checked} disabled={isDisabled} />
-    <span /> {/* need for button */}
-  </label>
-)
-
-Toggle.propTypes = {
-  checked: PropTypes.bool.isRequired,
-  onChange: PropTypes.func.isRequired,
+const Toggle = (props: ComponentProps) => {
+  const { checked, onChange, dataTut = null, isDisabled = false } = props
+  
+  return (
+    <label styleName={`Switch ${isDisabled ? 'disabled' : ''}`} data-tut={dataTut} >
+      <input type="checkbox" onChange={({ target }) => onChange(target.checked)} checked={checked} disabled={isDisabled} />
+      <span /> {/* need for button */}
+    </label>
+  )
 }
 
 export default CSSModules(Toggle, styles, { allowMultiple: true })
diff --git a/src/front/shared/components/controls/WithdrawButton/WithdrawButton.tsx b/src/front/shared/components/controls/WithdrawButton/WithdrawButton.tsx
index f843ab6497..70bd410ba9 100644
--- a/src/front/shared/components/controls/WithdrawButton/WithdrawButton.tsx
+++ b/src/front/shared/components/controls/WithdrawButton/WithdrawButton.tsx
@@ -1,15 +1,15 @@
-import React, { Fragment } from 'react'
-import PropTypes from 'prop-types'
-import config from 'app-config'
+import React from 'react'
 import cx from 'classnames'
-
 import CSSModules from 'react-css-modules'
 import styles from './WithdrawButton.scss'
-import ReactTooltip from 'react-tooltip'
-import { FormattedMessage } from 'react-intl'
 
+type ComponentProps = {
+  onClick: () => void
+  disable: boolean
+  children: JSX.Element | JSX.Element[]
+}
 
-const WithdrawButton = (props) => {
+const WithdrawButton = (props: ComponentProps) => {
   const {
     onClick,
     children,
@@ -17,21 +17,17 @@ const WithdrawButton = (props) => {
     ...rest
   } = props
 
+  const doNothing = () => undefined
+
   const styleName = cx('withdrawButton', {
     'disable': disable,
   })
 
   return (
-    <button onClick={!disable ? onClick : () => {}} styleName={styleName} {...rest}>
+    <button onClick={!disable ? onClick : doNothing} styleName={styleName} {...rest}>
       {children}
     </button>
   )
-  
-  //@ts-ignore
-  WithdrawButton.propTypes = {
-    onClick: PropTypes.func.isRequired,
-    className: PropTypes.string,
-    disabled: PropTypes.bool,
-  }
 }
+
 export default CSSModules(WithdrawButton, styles, { allowMultiple: true })
diff --git a/src/front/shared/components/layout/Overlay/Overlay.tsx b/src/front/shared/components/layout/Overlay/Overlay.tsx
index 1128e70c47..3d62be71e0 100644
--- a/src/front/shared/components/layout/Overlay/Overlay.tsx
+++ b/src/front/shared/components/layout/Overlay/Overlay.tsx
@@ -1,16 +1,26 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-
+import React, { useEffect } from 'react'
 import cssModules from 'react-css-modules'
 import styles from './Overlay.scss'
 
+type ComponentProps = {
+  children: JSX.Element | JSX.Element[]
+  onClick?: () => void
+  dashboardView?: boolean
+}
+
+const Overlay = (props: ComponentProps) => {
+  const {
+    children,
+    onClick = () => undefined,
+    dashboardView = false,
+  } = props
+
+  const [evaluatedHeight, setEvaluatedHeight] = React.useState(400)
 
-const Overlay = ({ children, onClick, dashboardView }) => {
-  let [evaluatedHeight, setEvaluatedHeight] = React.useState(400)
-  React.useEffect(() => {
+  useEffect(() => {
     if (dashboardView) {
-      //@ts-ignore: strictNullChecks
-      const elWithHeight: HTMLElement = document.querySelector('.__modalConductorProvided__ .contentHeightEvaluateHere')
+      const elWithHeight: HTMLElement | null = document.querySelector('.__modalConductorProvided__ .contentHeightEvaluateHere')
+
       if (elWithHeight) {
         setEvaluatedHeight(elWithHeight.clientHeight ||
           elWithHeight.offsetHeight ||
@@ -26,9 +36,4 @@ const Overlay = ({ children, onClick, dashboardView }) => {
   )
 }
 
-Overlay.propTypes = {
-  children: PropTypes.node,
-  onClick: PropTypes.func,
-}
-
 export default cssModules(Overlay, styles)
diff --git a/src/front/shared/components/loaders/RequestLoader/RequestLoader.tsx b/src/front/shared/components/loaders/RequestLoader/RequestLoader.tsx
index e0ef9f51d5..7f9639dbdc 100644
--- a/src/front/shared/components/loaders/RequestLoader/RequestLoader.tsx
+++ b/src/front/shared/components/loaders/RequestLoader/RequestLoader.tsx
@@ -1,11 +1,17 @@
 import React from 'react'
-import PropTypes from 'prop-types'
-
 import { connect } from 'redaction'
 import Loader from '../Loader/Loader'
 
+type ComponentProps = {
+  isVisible?: boolean
+  data: {
+    txId: string
+  }
+}
+
+const RequestLoader = (props: ComponentProps) => {
+  const { isVisible = false, data } = props
 
-const RequestLoader = ({ isVisible, data }) => {
   if (!isVisible) {
     return null
   }
@@ -13,14 +19,6 @@ const RequestLoader = ({ isVisible, data }) => {
   return <Loader data={data} />
 }
 
-RequestLoader.propTypes = {
-  isVisible: PropTypes.bool.isRequired,
-}
-
-RequestLoader.defaultProps = {
-  isVisible: false,
-}
-
 export default connect({
   isVisible: 'loader.isVisible',
   data: 'loader.data',
diff --git a/src/front/shared/components/modals/DeclineOrdersModal/DeclineOrdersModal.tsx b/src/front/shared/components/modals/DeclineOrdersModal/DeclineOrdersModal.tsx
index c3cc38e086..07ee4fb10e 100644
--- a/src/front/shared/components/modals/DeclineOrdersModal/DeclineOrdersModal.tsx
+++ b/src/front/shared/components/modals/DeclineOrdersModal/DeclineOrdersModal.tsx
@@ -1,23 +1,13 @@
-import React, { Fragment, Component } from 'react'
-import PropTypes from 'prop-types'
-
-import { connect } from 'redaction'
+import React, { Component } from 'react'
+import { withRouter } from 'react-router-dom'
+import { FormattedMessage, injectIntl, defineMessages } from 'react-intl'
 import actions from 'redux/actions'
 import { localisedUrl } from 'helpers/locale'
-
 import links from 'helpers/links'
-
 import cssModules from 'react-css-modules'
 import styles from './DeclineOrdersModal.scss'
 
 import Modal from 'components/modal/Modal/Modal'
-import Button from 'components/controls/Button/Button'
-import CopyToClipboard from 'react-copy-to-clipboard'
-
-import { FormattedMessage, injectIntl, defineMessages } from 'react-intl'
-
-import { withRouter } from 'react-router-dom'
-
 
 const title = defineMessages({
   downloadModal: {
@@ -52,7 +42,7 @@ class DeclineOrdersModal extends Component<any, any> {
         <div styleName="subTitle">
           <FormattedMessage id="decline43" defaultMessage="Sorry, but you have cannot start until you complete the swaps started earlier " />
         </div>
-        <h2 /* eslint-disable-line */ styleName="link" onClick={this.goToDecline}>
+        <h2 styleName="link" onClick={this.goToDecline}>
           <FormattedMessage id="decline49" defaultMessage="See your incomplete swap" />
         </h2>
       </Modal>
diff --git a/src/front/shared/helpers/links.ts b/src/front/shared/helpers/links.ts
index 70f998bca1..99de8a0951 100644
--- a/src/front/shared/helpers/links.ts
+++ b/src/front/shared/helpers/links.ts
@@ -17,7 +17,6 @@ const linksManager = {
   farm: 'https://farm.wpmix.net/',
   localStorage: '/localStorage',
 
-  creditCardDeposit: '/creditCardDeposit',
   wallets: '/wallets',
   send: '/withdraw',
   savePrivateSeed: '/savePrivateSeed',
@@ -29,13 +28,9 @@ const linksManager = {
   test: 'https://testnet.swaponline.io',
   main: 'https://swaponline.io/',
   wallet: '/wallet',
-  coins: '/coins',
-  partial: '/partial',
   notFound: '/NotFound',
   multisign: '/multisign',
   createInvoice: '/createinvoice',
-  BtcWallet: '/Bitcoin-wallet',
-  EthWallet: '/Ethereum-wallet',
 
   // social networks
   medium: '#',
diff --git a/src/front/shared/localisation/en.json b/src/front/shared/localisation/en.json
index 358f2fca6e..075dbf26a9 100644
--- a/src/front/shared/localisation/en.json
+++ b/src/front/shared/localisation/en.json
@@ -1318,7 +1318,7 @@
   },
   {
     "id": "CurrencyWalletTitle",
-    "message": "{fullName} ({currency}) Web Wallet with Atomic Swap.",
+    "message": "Swap.Online - {fullName} ({currency}) Web Wallet with Atomic Swap.",
     "files": [
       "src/front/shared/pages/CurrencyWallet/CurrencyWallet.tsx"
     ]
diff --git a/src/front/shared/localisation/es.json b/src/front/shared/localisation/es.json
index 05d5d76cf7..1c60e2e8f4 100644
--- a/src/front/shared/localisation/es.json
+++ b/src/front/shared/localisation/es.json
@@ -1206,7 +1206,7 @@
   },
   {
     "id": "CurrencyWalletTitle",
-    "message": "{fullName} ({currency}) Billetera web con Atomic Swap.",
+    "message": "Swap.Online - {fullName} ({currency}) Billetera web con Atomic Swap.",
     "files": [
       "src/front/shared/pages/CurrencyWallet/CurrencyWallet.tsx"
     ]
diff --git a/src/front/shared/localisation/nl.json b/src/front/shared/localisation/nl.json
index 884e34b4df..b9119f8d13 100644
--- a/src/front/shared/localisation/nl.json
+++ b/src/front/shared/localisation/nl.json
@@ -1199,7 +1199,7 @@
   },
   {
     "id": "CurrencyWalletTitle",
-    "message": "{fullName} ({currency}) Web Wallet with Atomic Swap.",
+    "message": "Swap.Online - {fullName} ({currency}) Web Wallet with Atomic Swap.",
     "files": [
       "src/front/shared/pages/CurrencyWallet/CurrencyWallet.tsx"
     ]
diff --git a/src/front/shared/localisation/pl.json b/src/front/shared/localisation/pl.json
index b9753a1944..1085abe7b3 100644
--- a/src/front/shared/localisation/pl.json
+++ b/src/front/shared/localisation/pl.json
@@ -1206,7 +1206,7 @@
   },
   {
     "id": "CurrencyWalletTitle",
-    "message": "{fullName} ({currency}) Web Wallet with Atomic Swap.",
+    "message": "Swap.Online - {fullName} ({currency}) Web Wallet with Atomic Swap.",
     "files": [
       "src/front/shared/pages/CurrencyWallet/CurrencyWallet.tsx"
     ]
diff --git a/src/front/shared/localisation/ru.json b/src/front/shared/localisation/ru.json
index b21069ed78..ffd667a507 100644
--- a/src/front/shared/localisation/ru.json
+++ b/src/front/shared/localisation/ru.json
@@ -1384,7 +1384,7 @@
   },
   {
     "id": "CurrencyWalletTitle",
-    "message": "{fullName} ({currency}) онлайн кошелек, работащюий на технологии Atomic Swap",
+    "message": "Swap.Online - {fullName} ({currency}) онлайн кошелек, работащюий на технологии Atomic Swap",
     "files": [
       "src/front/shared/pages/CurrencyWallet/CurrencyWallet.tsx"
     ]
diff --git a/src/front/shared/pages/CurrencyWallet/CurrencyWallet.tsx b/src/front/shared/pages/CurrencyWallet/CurrencyWallet.tsx
index d1edb6fda2..0415700e40 100644
--- a/src/front/shared/pages/CurrencyWallet/CurrencyWallet.tsx
+++ b/src/front/shared/pages/CurrencyWallet/CurrencyWallet.tsx
@@ -65,7 +65,7 @@ class CurrencyWallet extends Component<any, any> {
 
     const {
       match: {
-        params: { fullName = null, ticker = null, address = null },
+        params: { ticker = null, address = null },
       },
       hiddenCoinsList,
     } = props
@@ -73,12 +73,6 @@ class CurrencyWallet extends Component<any, any> {
     const items = actions.core.getWallets({})
     const walletAddress = address
 
-    // оставляю запасной вариант для старых ссылок
-    if (fullName) {
-      //@ts-ignore
-      ticker = fullName
-    }
-
     let itemCurrency = this.filterCurrencies({
       items,
       ticker,
@@ -199,7 +193,7 @@ class CurrencyWallet extends Component<any, any> {
 
     let {
       match: {
-        params: { address = null, fullName = null, ticker = null, action = null },
+        params: { address = null, ticker = null, action = null },
       },
       activeCurrency
     } = this.props
@@ -221,11 +215,6 @@ class CurrencyWallet extends Component<any, any> {
     ) {
       const items = actions.core.getWallets({})
       const walletAddress = address
-
-      // оставляю запасной вариант для старых ссылок
-      if (fullName) {
-        ticker = fullName
-      }
       
       let itemCurrency = this.filterCurrencies({
         items,
@@ -465,7 +454,6 @@ class CurrencyWallet extends Component<any, any> {
       currency,
       itemCurrency,
       balance,
-      fullName,
       infoAboutCurrency,
       txItems,
       filterValue,
@@ -537,11 +525,11 @@ class CurrencyWallet extends Component<any, any> {
         <PageSeo
           location={location}
           defaultTitle={intl.formatMessage(title.metaTitle, {
-            fullName,
+            fullName: currency,
             currency,
           })}
           defaultDescription={intl.formatMessage(description.metaDescription, {
-            fullName,
+            fullName: currency,
             currency,
           })}
         />
diff --git a/src/front/shared/pages/History/Filter/FilterLink/FilterLink.tsx b/src/front/shared/pages/History/Filter/FilterLink/FilterLink.tsx
index df1860defe..f3c3600deb 100644
--- a/src/front/shared/pages/History/Filter/FilterLink/FilterLink.tsx
+++ b/src/front/shared/pages/History/Filter/FilterLink/FilterLink.tsx
@@ -1,23 +1,24 @@
 import React from 'react'
-import PropTypes from 'prop-types'
-
 import CSSModules from 'react-css-modules'
 import styles from './FilterLink.scss'
 
+type ComponentProps = {
+  name: string
+  filter: string
+  onClick: () => void
+}
 
-const FilterLink = ({ name, filter, onClick }) => (
-  <span
-    styleName={filter === name.toLowerCase() ? 'item  active' : 'item'}
-    onClick={onClick}
-  >
-    {name}
-  </span>
-)
+const FilterLink = (props: ComponentProps) => {
+  const { name, filter, onClick } = props
 
-FilterLink.propTypes = {
-  name: PropTypes.string.isRequired,
-  filter: PropTypes.string.isRequired,
-  onClick: PropTypes.func.isRequired,
+  return (
+    <span
+      styleName={filter === name.toLowerCase() ? 'item  active' : 'item'}
+      onClick={onClick}
+    >
+      {name}
+    </span>
+  )
 }
 
 export default CSSModules(FilterLink, styles, { allowMultiple: true })