mirror of
https://github.com/fullstack-cash/fullstack-gatsby-theme-bch-wallet.git
synced 2026-09-22 09:12:06 -07:00
fix(Send BCH): Removing validation of BCH addresses when scanning QR
This commit is contained in:
Chris Troutner
@@ -36,77 +36,83 @@ class Send extends React.Component {
|
||||
<Col sm={8}>
|
||||
<Box
|
||||
loaded={!_this.state.inFetch}
|
||||
className='hover-shadow border-none mt-2'
|
||||
className="hover-shadow border-none mt-2"
|
||||
>
|
||||
<Row>
|
||||
<Col sm={12} className='text-center'>
|
||||
<Col sm={12} className="text-center">
|
||||
<h1>
|
||||
<FontAwesomeIcon
|
||||
className='title-icon'
|
||||
size='xs'
|
||||
icon='paper-plane'
|
||||
className="title-icon"
|
||||
size="xs"
|
||||
icon="paper-plane"
|
||||
/>
|
||||
<span>Send</span>
|
||||
</h1>
|
||||
<Box className='border-none'>
|
||||
<Box className="border-none">
|
||||
<Text
|
||||
id='addressToSend'
|
||||
name='address'
|
||||
placeholder='Enter bch address to send'
|
||||
label='BCH Address'
|
||||
labelPosition='above'
|
||||
id="addressToSend"
|
||||
name="address"
|
||||
placeholder="Enter bch address to send"
|
||||
label="BCH Address"
|
||||
labelPosition="above"
|
||||
onChange={_this.handleUpdate}
|
||||
className='title-icon'
|
||||
className="title-icon"
|
||||
buttonRight={
|
||||
<Button
|
||||
icon='fa-qrcode'
|
||||
icon="fa-qrcode"
|
||||
onClick={_this.handleModal}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
|
||||
<Text
|
||||
id='amountToSend'
|
||||
name='amountSat'
|
||||
id="amountToSend"
|
||||
name="amountSat"
|
||||
value={_this.state.amountSat}
|
||||
placeholder={`Enter amount to send in ${_this.state.sendCurrency}`}
|
||||
label='Amount'
|
||||
labelPosition='above'
|
||||
label="Amount"
|
||||
labelPosition="above"
|
||||
onChange={_this.handleUpdate}
|
||||
addonRight={_this.state.sendCurrency}
|
||||
buttonRight={
|
||||
<Button
|
||||
icon='fa-random'
|
||||
icon="fa-random"
|
||||
onClick={_this.handleChangeCurrency}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
<div className='text-left pb-4'>
|
||||
<div className="text-left pb-4">
|
||||
<p>
|
||||
{_this.state.sendCurrency === 'BCH'
|
||||
? `USD: ${(_this.state.amountSat * (_this.props.currentRate / 100)).toFixed(2)}`
|
||||
: `BCH: ${(_this.state.amountSat / (_this.props.currentRate / 100)).toFixed(8)}`}
|
||||
? `USD: ${(
|
||||
_this.state.amountSat *
|
||||
(_this.props.currentRate / 100)
|
||||
).toFixed(2)}`
|
||||
: `BCH: ${(
|
||||
_this.state.amountSat /
|
||||
(_this.props.currentRate / 100)
|
||||
).toFixed(8)}`}
|
||||
</p>
|
||||
</div>
|
||||
<Button
|
||||
text='Send'
|
||||
type='primary'
|
||||
className='btn-lg'
|
||||
text="Send"
|
||||
type="primary"
|
||||
className="btn-lg"
|
||||
onClick={_this.handleSend}
|
||||
/>
|
||||
</Box>
|
||||
</Col>
|
||||
<Col sm={12} className='text-center'>
|
||||
<Col sm={12} className="text-center">
|
||||
{_this.state.errMsg && (
|
||||
<p className='error-color'>{_this.state.errMsg}</p>
|
||||
<p className="error-color">{_this.state.errMsg}</p>
|
||||
)}
|
||||
{_this.state.txId && (
|
||||
<a
|
||||
target='_blank'
|
||||
rel='noopener noreferrer'
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
href={`https://explorer.bitcoin.com/bch/tx/${_this.state.txId}`}
|
||||
>
|
||||
Transaction ID: {_this.state.txId}
|
||||
Transaction ID: {_this.state.txId}
|
||||
</a>
|
||||
)}
|
||||
</Col>
|
||||
@@ -132,7 +138,10 @@ class Send extends React.Component {
|
||||
})
|
||||
if (_this.state.amountSat > 0) {
|
||||
_this.setState({
|
||||
amountSat: (_this.state.amountSat / (_this.props.currentRate / 100)).toFixed(8)
|
||||
amountSat: (
|
||||
_this.state.amountSat /
|
||||
(_this.props.currentRate / 100)
|
||||
).toFixed(8)
|
||||
})
|
||||
}
|
||||
} else {
|
||||
@@ -141,7 +150,10 @@ class Send extends React.Component {
|
||||
})
|
||||
if (_this.state.amountSat > 0) {
|
||||
_this.setState({
|
||||
amountSat: (_this.state.amountSat * (_this.props.currentRate / 100)).toFixed(2)
|
||||
amountSat: (
|
||||
_this.state.amountSat *
|
||||
(_this.props.currentRate / 100)
|
||||
).toFixed(2)
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -274,7 +286,6 @@ class Send extends React.Component {
|
||||
}
|
||||
|
||||
onHandleScan (data) {
|
||||
const validateAdrrs = ['bitcoincash', 'simpleledger']
|
||||
try {
|
||||
_this.resetAddressValue()
|
||||
if (!data) {
|
||||
@@ -283,22 +294,14 @@ class Send extends React.Component {
|
||||
if (typeof data !== 'string') {
|
||||
throw new Error('It should scan a bch address or slp address')
|
||||
}
|
||||
// Validates that the words "bitcoincash" or "simpleledger" are contained
|
||||
let isValid = false
|
||||
for (let i = 0; i < validateAdrrs.length; i++) {
|
||||
isValid = isValid ? true : data.match(validateAdrrs[i])
|
||||
if (isValid) {
|
||||
_this.setState({
|
||||
address: data,
|
||||
errMsg: ''
|
||||
})
|
||||
const addressEle = document.getElementById('addressToSend')
|
||||
addressEle.value = data
|
||||
}
|
||||
}
|
||||
if (!isValid) {
|
||||
throw new Error('It should scan a bch address or slp address')
|
||||
}
|
||||
|
||||
_this.setState({
|
||||
address: data,
|
||||
errMsg: ''
|
||||
})
|
||||
const addressEle = document.getElementById('addressToSend')
|
||||
addressEle.value = data
|
||||
|
||||
_this.onHandleToggleScanner()
|
||||
} catch (error) {
|
||||
_this.onHandleToggleScanner()
|
||||
@@ -321,9 +324,9 @@ class Send extends React.Component {
|
||||
Rate limits exceeded, increase rate limits with a JWT token from
|
||||
<a
|
||||
style={{ marginLeft: '5px' }}
|
||||
target='_blank'
|
||||
href='https://fullstack.cash'
|
||||
rel='noopener noreferrer'
|
||||
target="_blank"
|
||||
href="https://fullstack.cash"
|
||||
rel="noopener noreferrer"
|
||||
>
|
||||
FullStack.cash
|
||||
</a>
|
||||
|
||||
Reference in New Issue
Block a user