LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Swap: populate 'status' from 'btc/swap' response instead of waiting for first websocket input. (#5997)

Browse source 
* Swap: populate 'status' from 'btc/swap' response instead of waiting for first websocket input.

## Issue
Clsoes 5975: swap stop at processing even though response comes through

## Notes
Occasionally, the first websocket message doesn't come through (seems like the commerce didn't send?). There's really no need to wait for one more 'status=NEW' message to ensure the right data is being populated (being over-cautious here).

* Beautify the "exact amount" advice.
This commit is contained in:
infinite-persistence 2021-05-04 23:08:01 +08:00 • committed by GitHub
parent 0b9e8e4e3a
commit 432c1233b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
static/app-strings.json
View file

@ -1786,7 +1786,7 @@
"Remove %address%?": "Remove %address%?", "Remove %address%?": "Remove %address%?",
"This process cannot be reversed.": "This process cannot be reversed.", "This process cannot be reversed.": "This process cannot be reversed.",
"View transaction": "View transaction", "View transaction": "View transaction",
"Send (USE COPY BUTTON, ENSURE EXACT AMOUNT IS SENT!)": "Send (USE COPY BUTTON, ENSURE EXACT AMOUNT IS SENT!)", "Use the copy button to ensure the EXACT amount is sent!": "Use the copy button to ensure the EXACT amount is sent!",
"Amount copied.": "Amount copied.", "Amount copied.": "Amount copied.",
"Copy transaction ID": "Copy transaction ID", "Copy transaction ID": "Copy transaction ID",
"Transaction ID copied.": "Transaction ID copied.", "Transaction ID copied.": "Transaction ID copied.",

18
ui/component/walletSwap/view.jsx
View file

@ -301,16 +301,25 @@ function WalletSwap(props: Props) {
const btcAmount = response.Charge.data.pricing['bitcoin'].amount; const btcAmount = response.Charge.data.pricing['bitcoin'].amount;
const rate = response.Exchange.rate; const rate = response.Exchange.rate;
const swap = { const timeline = response.Charge.data.timeline;
const lastTimeline = timeline[timeline.length - 1];
const newSwap = {
chargeCode: response.Exchange.charge_code, chargeCode: response.Exchange.charge_code,
coins: Object.keys(response.Charge.data.addresses), coins: Object.keys(response.Charge.data.addresses),
sendAddresses: response.Charge.data.addresses, sendAddresses: response.Charge.data.addresses,
sendAmounts: response.Charge.data.pricing, sendAmounts: response.Charge.data.pricing,
lbcAmount: (btcAmount * BTC_SATOSHIS) / rate, lbcAmount: (btcAmount * BTC_SATOSHIS) / rate,
status: {
status: lastTimeline.status,
receiptCurrency: lastTimeline.payment.value.currency,
receiptTxid: lastTimeline.payment.transaction_id,
lbcTxid: response.Exchange.lbc_txid || '',
},
}; };
setSwap({ ...swap }); setSwap({ ...newSwap });
addCoinSwap({ ...swap }); addCoinSwap({ ...newSwap });
}) })
.catch((err) => { .catch((err) => {
setNag({ msg: err === INTERNAL_APIS_DOWN ? NAG_SWAP_CALL_FAILED : err.message, type: 'error' }); setNag({ msg: err === INTERNAL_APIS_DOWN ? NAG_SWAP_CALL_FAILED : err.message, type: 'error' });
@ -532,7 +541,7 @@ function WalletSwap(props: Props) {
{getGap()} {getGap()}
</> </>
)} )}
<div className="confirm__label">{__('Send (USE COPY BUTTON, ENSURE EXACT AMOUNT IS SENT!)')}</div> <div className="confirm__label">{__('Send')}</div>
<CopyableText <CopyableText
primaryButton primaryButton
copyable={getCoinSendAmountStr(coin)} copyable={getCoinSendAmountStr(coin)}
@ -545,6 +554,7 @@ function WalletSwap(props: Props) {
} }
}} }}
/> />
<div className="help">{__('Use the copy button to ensure the EXACT amount is sent!')}</div>
{getGap()} {getGap()}
<div className="confirm__label">{__('To')}</div> <div className="confirm__label">{__('To')}</div>
<CopyableText primaryButton copyable={getCoinAddress(coin)} snackMessage={__('Address copied.')} /> <CopyableText primaryButton copyable={getCoinAddress(coin)} snackMessage={__('Address copied.')} />