fullstack/fullstack-gatsby-theme-bch-wallet
1
0
Fork 0
mirror of https://github.com/fullstack-cash/fullstack-gatsby-theme-bch-wallet.git synced 2026-09-22 17:22:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40 from Permissionless-Software-Foundation/dh-429-errors

Browse Source 
feat(rate-limits): Display rate limit error to the users
This commit is contained in:
Chris Troutner
2020-07-19 06:43:18 -07:00
committed by GitHub
parent 8b0efdf6da 434a52a81f
commit 2e9f58cd01
6 changed files with 215 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/admin-lte/configure/index.js
+2 -4
View File
@@ -130,7 +130,6 @@ class Configure extends React.Component {
_this.setState({
[event.target.name]: value
})
console.log(_this.state.JWT)
}
async handleUpdateJWT () {
@@ -139,13 +138,13 @@ class Configure extends React.Component {
const apiToken = _this.state.JWT
// Update instance with JWT
if (mnemonic && apiToken) {
if (mnemonic) {
const bchjsOptions = { apiToken: apiToken }
if (selectedServer) {
bchjsOptions.restURL = selectedServer
}
console.log('bchjs options : ', bchjsOptions)
// console.log('bchjs options : ', bchjsOptions)
const bchWalletLib = new _this.BchWallet(mnemonic, bchjsOptions)
// Update bchjs instances of minimal-slp-wallet libraries
@@ -161,7 +160,6 @@ class Configure extends React.Component {
_this.props.setWalletInfo(walletInfo)
} catch (error) {
console.warn(error)
_this.setState({
errMsg: error.message
})
src/components/admin-lte/send-receive/send.js
+46 -19
View File
@@ -18,7 +18,8 @@ class Send extends React.Component {
amountSat: '',
errMsg: '',
txId: '',
showScan: false
showScan: false,
inFetch: false
}
_this.BchWallet = BchWallet
}
@@ -30,7 +31,10 @@ class Send extends React.Component {
<Row>
<Col sm={2} />
<Col sm={8}>
<Box className='hover-shadow border-none mt-2'>
<Box
loaded={!_this.state.inFetch}
className='hover-shadow border-none mt-2'
>
<Row>
<Col sm={12} className='text-center'>
<h1>
@@ -102,7 +106,6 @@ class Send extends React.Component {
_this.setState({
[event.target.name]: value
})
// console.log(_this.state)
}
async handleSend () {
@@ -124,6 +127,9 @@ class Send extends React.Component {
if (!bchWalletLib) {
throw new Error('Wallet not found')
}
_this.setState({
inFetch: true
})
// Ensure the wallet UTXOs are up-to-date.
const walletAddr = bchWalletLib.walletInfo.address
@@ -147,19 +153,7 @@ class Send extends React.Component {
_this.resetValues()
} catch (error) {
let errMsg
if (error.message) {
errMsg = error.message
} else if (error.error) {
errMsg = error.error
}
_this.setState(prevState => {
return {
...prevState,
errMsg,
txId: ''
}
})
_this.handleError(error)
}
}
@@ -168,7 +162,8 @@ class Send extends React.Component {
_this.setState({
address: '',
amountSat: '',
errMsg: ''
errMsg: '',
inFetch: false
})
const amountEle = document.getElementById('amountToSend')
amountEle.value = ''
@@ -180,7 +175,6 @@ class Send extends React.Component {
validateInputs () {
const { address, amountSat } = _this.state
const amountNumber = Number(amountSat)
console.log(_this.state)
if (!address) {
throw new Error('Address is required')
@@ -255,7 +249,40 @@ class Send extends React.Component {
}
}
componentDidMount () {}
handleError (error) {
// console.error(error)
let errMsg = ''
if (error.message) {
errMsg = error.message
}
if (error.error) {
if (error.error.match('rate limits')) {
errMsg = (
<span>
Rate limits exceeded, increase rate limits with a JWT token from
<a
style={{ marginLeft: '5px' }}
target='_blank'
href='https://fullstack.cash'
rel='noopener noreferrer'
>
FullStack.cash
</a>
</span>
)
} else {
errMsg = error.error
}
}
_this.setState(prevState => {
return {
...prevState,
errMsg,
txId: '',
inFetch: false
}
})
}
}
Send.propTypes = {
updateBalance: PropTypes.func.isRequired,
src/components/admin-lte/tokens/index.js
+55 -25
View File
@@ -17,7 +17,7 @@ class Tokens extends React.Component {
selectedTokenToView: '',
showModal: false,
inFetch: true,
onEmptyTokensMsg: 'No tokens found on this wallet..',
errMsg: '',
selectedTokenToSend: '',
showForm: false
}
@@ -68,11 +68,11 @@ class Tokens extends React.Component {
</Box>
)}
<br />
{!_this.state.tokens.length && (
{_this.state.errMsg && (
<Box padding='true' className='container-nofound'>
<Row>
<Col xs={12}>
<em>{_this.state.onEmptyTokensMsg}</em>
<em>{_this.state.errMsg}</em>
</Col>
</Row>
</Box>
@@ -125,31 +125,27 @@ class Tokens extends React.Component {
const { mnemonic } = _this.props.walletInfo
const bchWallet = _this.props.bchWallet
let tokens = []
let { onEmptyTokensMsg } = _this.state
if (mnemonic && bchWallet) {
try {
await bchWallet.walletInfoPromise
tokens = await bchWallet.listTokens()
} catch (error) {
console.error(error)
if (error.error) {
if (error.error.match('rate limits')) onEmptyTokensMsg = error.error
}
if (error.message) {
onEmptyTokensMsg = error.message
}
try {
if (!mnemonic || !bchWallet) {
throw new Error(
'You need to create or import a wallet first, to view tokens'
)
}
} else {
onEmptyTokensMsg =
'You need to create or import a wallet first, to view tokens'
}
_this.setState({
tokens,
inFetch: false,
onEmptyTokensMsg
})
await bchWallet.walletInfoPromise
tokens = await bchWallet.listTokens()
if (!tokens.length) {
throw new Error('No tokens found on this wallet.')
}
_this.setState({
tokens,
inFetch: false
})
} catch (error) {
_this.handleError(error)
}
}
async componentDidMount () {
@@ -178,6 +174,40 @@ class Tokens extends React.Component {
showModal: !_this.state.showModal
})
}
handleError (error) {
let errMsg = ''
if (error.message) {
errMsg = error.message
}
if (error.error) {
if (error.error.match('rate limits')) {
errMsg = (
<span>
Rate limits exceeded, increase rate limits with a JWT token from
<a
style={{ marginLeft: '5px' }}
target='_blank'
href='https://fullstack.cash'
rel='noopener noreferrer'
>
FullStack.cash
</a>
</span>
)
} else {
errMsg = error.error
}
}
_this.setState(prevState => {
return {
...prevState,
errMsg: errMsg,
txId: '',
inFetch: false
}
})
}
}
Tokens.propTypes = {
walletInfo: PropTypes.object.isRequired, // wallet info
src/components/admin-lte/tokens/send-tokens.js
+35 -16
View File
@@ -173,20 +173,7 @@ class SendTokens extends React.Component {
_this.props.handleSend()
}, 1000)
} catch (error) {
let errMsg
if (error.message) {
errMsg = error.message
} else if (error.error) {
errMsg = error.error
}
_this.setState(prevState => {
return {
...prevState,
errMsg,
txId: '',
inFetch: false
}
})
_this.handleError(error)
}
}
@@ -207,7 +194,6 @@ class SendTokens extends React.Component {
validateInputs () {
const { address, amountSat } = _this.state
const amountNumber = Number(amountSat)
console.log(_this.state)
if (!address) {
throw new Error('Address is required')
@@ -282,7 +268,40 @@ class SendTokens extends React.Component {
}
}
componentDidMount () {}
handleError (error) {
// console.error(error)
let errMsg = ''
if (error.message) {
errMsg = error.message
}
if (error.error) {
if (error.error.match('rate limits')) {
errMsg = (
<span>
Rate limits exceeded, increase rate limits with a JWT token from
<a
style={{ marginLeft: '5px' }}
target='_blank'
href='https://fullstack.cash'
rel='noopener noreferrer'
>
FullStack.cash
</a>
</span>
)
} else {
errMsg = error.error
}
}
_this.setState(prevState => {
return {
...prevState,
errMsg,
txId: '',
inFetch: false
}
})
}
}
SendTokens.propTypes = {
walletInfo: PropTypes.object.isRequired, // wallet info
src/components/admin-lte/wallet/create.js
+38 -12
View File
@@ -38,11 +38,6 @@ class NewWallet extends React.Component {
<span>New Wallet</span>
</h1>
</Col>
<Col sm={12} className='text-center '>
{_this.state.errMsg && (
<p className='error-color mt-2'>{_this.state.errMsg}</p>
)}
</Col>
<Col sm={12} className='text-center mt-2 mb-2'>
<Button
text='Create Wallet'
@@ -51,6 +46,11 @@ class NewWallet extends React.Component {
onClick={_this.handleCreateWallet}
/>
</Col>
<Col sm={12} className='text-center '>
{_this.state.errMsg && (
<p className='error-color mt-2'>{_this.state.errMsg}</p>
)}
</Col>
</Row>
</Box>
</Col>
@@ -85,7 +85,6 @@ class NewWallet extends React.Component {
if (restURL) {
bchjsOptions.restURL = restURL
}
console.log('bchjs options : ', bchjsOptions)
}
const bchWalletLib = new _this.BchWallet(null, bchjsOptions)
@@ -102,7 +101,7 @@ class NewWallet extends React.Component {
Object.assign(currentWallet, walletInfo)
const myBalance = await bchWalletLib.getBalance()
// console.log("myBalance", myBalance)
// Update redux state
_this.props.setWalletInfo(currentWallet)
_this.props.updateBalance(myBalance)
@@ -113,13 +112,40 @@ class NewWallet extends React.Component {
errMsg: ''
})
} catch (error) {
console.error(error)
_this.setState({
inFetch: false,
errMsg: error.message
})
_this.handleError(error)
}
}
handleError (error) {
// console.error(error)
let errMsg = ''
if (error.message) {
errMsg = error.message
}
if (error.error) {
if (error.error.match('rate limits')) {
errMsg = (
<span>
Rate limits exceeded, increase rate limits with a JWT token from
<a
style={{ marginLeft: '5px' }}
target='_blank'
href='https://fullstack.cash'
rel='noopener noreferrer'
>
FullStack.cash
</a>
</span>
)
} else {
errMsg = error.error
}
}
_this.setState({
inFetch: false,
errMsg: errMsg
})
}
}
NewWallet.propTypes = {
walletInfo: PropTypes.object.isRequired,
src/components/admin-lte/wallet/import.js
+39 -13
View File
@@ -58,13 +58,7 @@ class ImportWallet extends React.Component {
</Col>
</Row>
</Col>
<Col sm={12} className='text-center'>
{_this.state.errMsg && (
<p className='error-color'>{_this.state.errMsg}</p>
)}
</Col>
<Col sm={12} className='text-center mt-2 mb-2'>
<Col sm={12} className='text-center mb-2'>
<Button
text='Import'
type='primary'
@@ -72,6 +66,11 @@ class ImportWallet extends React.Component {
onClick={_this.handleImportWallet}
/>
</Col>
<Col sm={12} className='text-center'>
{_this.state.errMsg && (
<p className='error-color'>{_this.state.errMsg}</p>
)}
</Col>
</Row>
</Box>
</Col>
@@ -155,11 +154,7 @@ class ImportWallet extends React.Component {
inFetch: false
})
} catch (error) {
console.warn(error)
_this.setState({
errMsg: error.message,
inFetch: false
})
_this.handleError(error)
}
}
@@ -180,13 +175,44 @@ class ImportWallet extends React.Component {
const spaceCount = mnemonic.split(' ').length // mnemonic.match(/ /g).length
if (spaceCount !== 12) {
console.log('reject')
// console.log('reject')
throw new Error('mnemonic must contain 12 words')
}
} else {
throw new Error('12 word mnemonic is required')
}
}
handleError (error) {
// console.error(error)
let errMsg = ''
if (error.message) {
errMsg = error.message
}
if (error.error) {
if (error.error.match('rate limits')) {
errMsg = (
<span>
Rate limits exceeded, increase rate limits with a JWT token from
<a
style={{ marginLeft: '5px' }}
target='_blank'
href='https://fullstack.cash'
rel='noopener noreferrer'
>
FullStack.cash
</a>
</span>
)
} else {
errMsg = error.error
}
}
_this.setState({
inFetch: false,
errMsg: errMsg
})
}
}
ImportWallet.propTypes = {