Skip to content

Commit

Permalink
travis errors
Browse files Browse the repository at this point in the history
  • Loading branch information
nthgness committed Feb 2, 2019
1 parent 0fc36a2 commit cd59246
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 18 deletions.
4 changes: 1 addition & 3 deletions shared/pages/Swap/BtcToEth.js
@@ -1,7 +1,5 @@
import React, { Component, Fragment } from 'react'

import actions from 'redux/actions'

import crypto from 'crypto'

import CSSModules from 'react-css-modules'
Expand Down Expand Up @@ -198,7 +196,7 @@ export default class BtcToEth extends Component {
lockTime={flow.btcScriptValues.lockTime}
ownerPublicKey={flow.btcScriptValues.ownerPublicKey}
/>}
{children}
{children}
</div>
)
}
Expand Down
2 changes: 1 addition & 1 deletion shared/pages/Swap/BtcToEthToken.js
Expand Up @@ -248,7 +248,7 @@ export default class BtcToEthToken extends Component {
lockTime={flow.btcScriptValues.lockTime}
ownerPublicKey={flow.btcScriptValues.ownerPublicKey}
/>}
{children}
{children}
</div>
)
}
Expand Down
4 changes: 2 additions & 2 deletions shared/pages/Swap/EthToBtc.js
Expand Up @@ -156,7 +156,7 @@ export default class EthToBtc extends Component {
</strong>
)
}
</div>
</div>
{!this.props.enoughBalance && flow.step === 4
? (
<div className={this.props.styles.swapDepositWindow}>
Expand Down Expand Up @@ -186,7 +186,7 @@ export default class EthToBtc extends Component {
lockTime={flow.btcScriptValues.lockTime}
ownerPublicKey={flow.btcScriptValues.ownerPublicKey}
/>}
{children}
{children}
</div>
)
}
Expand Down
2 changes: 1 addition & 1 deletion shared/pages/Swap/EthTokenToBtc.js
Expand Up @@ -201,7 +201,7 @@ export default class EthTokenToBtc extends Component {
lockTime={flow.btcScriptValues.lockTime}
ownerPublicKey={flow.btcScriptValues.ownerPublicKey}
/>}
{children}
{children}
</div>
)
}
Expand Down
32 changes: 24 additions & 8 deletions shared/pages/Swap/SwapProgress/SwapProgress.js
Expand Up @@ -134,19 +134,35 @@ export default class SwapProgress extends Component {
} = this.state

const progress = Math.floor(360 / (swap.flow.steps.length - 1) * this.state.flow.step)
const isFinish = flow.step === swap.flow.steps.length - 1;

const finishSvg = <svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 130.2 130.2">
<circle className="path circle" fill="none" stroke="#3de25b" stroke-width="6" stroke-miterlimit="10" cx="65.1" cy="65.1" r="62.1"/>
<polyline className="path check" fill="none" stroke="#3de25b" stroke-width="6" stroke-linecap="round" stroke-miterlimit="10" points="100.2,40.2 51.5,88.8 29.8,67.5 "/>
</svg>
const isFinish = flow.step === swap.flow.steps.length - 1

const finishSvg = (
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 130.2 130.2">
<circle
className="path circle"
fill="none"
stroke="#3de25b"
strokeWidth="6"
strokeMiterlimit="10"
cx="65.1"
cy="65.1"
r="62.1"
/>
<polyline
className="path check"
fill="none"
stroke="#3de25b"
strokeWidth="6"
strokeLinecap="round"
strokeMiterlimit="10"
points="100.2,40.2 51.5,88.8 29.8,67.5 "
/>
</svg>)

return (
<div styleName="overlay">
<div styleName="container">
<div styleName="stepContainer">
<div styleName="swapInfo">
</div>
<div styleName="progressContainer">
<div styleName={progress > 180 ? 'progress-pie-chart gt-50' : 'progress-pie-chart'}>
<div styleName="ppc-progress">
Expand Down
Expand Up @@ -33,11 +33,17 @@ export default class BtcToEthTokens extends Component {
)
case 6:
return (
<FormattedMessage id="BitcoinBuyText41" defaultMessage="Waiting for {buyCurrency} tokens Owner to add a Secret Key to ETH Contact" values={{ buyCurrency: `${this.props.swap.buyCurrency}` }} />
<FormattedMessage
id="BitcoinBuyText41"
defaultMessage="Waiting for {buyCurrency} tokens Owner to add a Secret Key to ETH Contact"
values={{ buyCurrency: `${this.props.swap.buyCurrency}` }} />
)
case 7:
return (
<FormattedMessage id="BitcoinBuyText45" defaultMessage="{buyCurrency} tokens was transferred to your wallet. Check the balance." values={{ buyCurrency: `${this.props.swap.buyCurrency}` }} />
<FormattedMessage
id="BitcoinBuyText45"
defaultMessage="{buyCurrency} tokens was transferred to your wallet. Check the balance."
values={{ buyCurrency: `${this.props.swap.buyCurrency}` }} />
)
case 8:
return (
Expand Down
Expand Up @@ -39,7 +39,7 @@ export default class EthTokensToBtc extends Component {
return (
<FormattedMessage
id="EthTokensToBtc40"
defaultMessage="The funds from ETH contract was successfully transferred to BTC owner. BTC owner left a secret key. Requesting withdrawal from BTC script. Please wait.."
defaultMessage="The funds from ETH contract was successfully transferred to BTC owner"
/>
)
case 8:
Expand Down

0 comments on commit cd59246

Please sign in to comment.