mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-25 07:27:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Show popup on MissingDelayedPayoutTxException. Update display string of popup

Browse source
This commit is contained in:
chimp1984 2020-09-21 18:56:58 -05:00
parent 66a26893f0
commit 690104e6ea
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
3 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/src/main/resources/i18n/displayStrings.properties
View file

@ -559,9 +559,10 @@ portfolio.tab.history=History
portfolio.tab.failed=Failed portfolio.tab.failed=Failed
portfolio.tab.editOpenOffer=Edit offer portfolio.tab.editOpenOffer=Edit offer
portfolio.pending.invalidDelayedPayoutTx=Please do NOT send the Altcoin or Fiat payment but contact the Bisq \ portfolio.pending.invalidDelayedPayoutTx=There is an issue with a missing or invalid transaction.\n\n\
developers at 'https://bisq.community' or the Keybase channel.\n\n\ Please do NOT send the Altcoin or Fiat payment but contact the Bisq \
{0} developers at 'https://bisq.community' or the Keybase channel for further assistance.\n\n\
Error message: {0}
portfolio.pending.step1.waitForConf=Wait for blockchain confirmation portfolio.pending.step1.waitForConf=Wait for blockchain confirmation
portfolio.pending.step2_buyer.startPayment=Start payment portfolio.pending.step2_buyer.startPayment=Start payment
@ -904,10 +905,10 @@ portfolio.failed.Failed=Failed
portfolio.failed.unfail=Before proceeding, make sure you have a backup of your data directory!\n\ portfolio.failed.unfail=Before proceeding, make sure you have a backup of your data directory!\n\
Do you want to move this trade back to open trades?\n\ Do you want to move this trade back to open trades?\n\
This is a way to unlock funds stuck in a failed trade. This is a way to unlock funds stuck in a failed trade.
portfolio.failed.cantUnfail=This trade cannot be moved back to open trades at the moment. \n\ portfolio.failed.cantUnfail=This trade cannot be moved back to pending trades at the moment. \n\
Try again after completion of trade(s) {0} Try again after completion of trade(s) {0}
portfolio.failed.depositTxNull=The trade cannot be completed. Deposit transaction is null portfolio.failed.depositTxNull=The trade cannot be reverted to a pending trade. Deposit transaction is null.
portfolio.failed.delayedPayoutTxNull=The trade cannot be completed. Delayed payout transaction is null portfolio.failed.delayedPayoutTxNull=The trade cannot be reverted to a pending trade. Delayed payout transaction is null.
#################################################################### ####################################################################

6
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java
View file

@ -46,13 +46,11 @@ public class BuyerStep1View extends TradeStepView {
} catch (DelayedPayoutTxValidation.DonationAddressException | } catch (DelayedPayoutTxValidation.DonationAddressException |
DelayedPayoutTxValidation.InvalidTxException | DelayedPayoutTxValidation.InvalidTxException |
DelayedPayoutTxValidation.AmountMismatchException | DelayedPayoutTxValidation.AmountMismatchException |
DelayedPayoutTxValidation.InvalidLockTimeException e) { DelayedPayoutTxValidation.InvalidLockTimeException |
DelayedPayoutTxValidation.MissingDelayedPayoutTxException e) {
if (!model.dataModel.tradeManager.isAllowFaultyDelayedTxs()) { if (!model.dataModel.tradeManager.isAllowFaultyDelayedTxs()) {
new Popup().warning(Res.get("portfolio.pending.invalidDelayedPayoutTx", e.getMessage())).show(); new Popup().warning(Res.get("portfolio.pending.invalidDelayedPayoutTx", e.getMessage())).show();
} }
} catch (DelayedPayoutTxValidation.MissingDelayedPayoutTxException ignore) {
// We don't react on those errors as a failed trade might get listed initially but getting removed from the
// trade manager after initPendingTrades which happens after activate might be called.
} }
} }

6
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
View file

@ -125,13 +125,11 @@ public class BuyerStep2View extends TradeStepView {
} catch (DelayedPayoutTxValidation.DonationAddressException | } catch (DelayedPayoutTxValidation.DonationAddressException |
DelayedPayoutTxValidation.InvalidTxException | DelayedPayoutTxValidation.InvalidTxException |
DelayedPayoutTxValidation.AmountMismatchException | DelayedPayoutTxValidation.AmountMismatchException |
DelayedPayoutTxValidation.InvalidLockTimeException e) { DelayedPayoutTxValidation.InvalidLockTimeException |
DelayedPayoutTxValidation.MissingDelayedPayoutTxException e) {
if (!model.dataModel.tradeManager.isAllowFaultyDelayedTxs()) { if (!model.dataModel.tradeManager.isAllowFaultyDelayedTxs()) {
new Popup().warning(Res.get("portfolio.pending.invalidDelayedPayoutTx", e.getMessage())).show(); new Popup().warning(Res.get("portfolio.pending.invalidDelayedPayoutTx", e.getMessage())).show();
} }
} catch (DelayedPayoutTxValidation.MissingDelayedPayoutTxException ignore) {
// We don't react on those errors as a failed trade might get listed initially but getting removed from the
// trade manager after initPendingTrades which happens after activate might be called.
} }
if (timeoutTimer != null) if (timeoutTimer != null)