boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2025-01-24 16:45:51 +00:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

cannot open dispute until both deposits confirmed and available

Browse source
This commit is contained in:
woodser 2022-12-19 11:18:50 +00:00
parent e85682e635
commit f13e1ec610
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -645,7 +645,7 @@ portfolio.pending.autoConf.state.FAILED=A service returned with a failure. No au
portfolio.pending.step1.info=Deposit transaction has been published.\n{0} need to wait for 10 confirmations (about 20 minutes) before the payment can start. portfolio.pending.step1.info=Deposit transaction has been published.\n{0} need to wait for 10 confirmations (about 20 minutes) before the payment can start.
portfolio.pending.step1.warn=The deposit transaction is not confirmed yet. This usually takes about 20 minutes, but could be more if the network is congested. portfolio.pending.step1.warn=The deposit transaction is not confirmed yet. This usually takes about 20 minutes, but could be more if the network is congested.
portfolio.pending.step1.openForDispute=The deposit transaction is still not confirmed. \ portfolio.pending.step1.openForDispute=The deposit transaction is still not confirmed. \
If you have been waiting for much longer than 20 minutes, contact an arbitrator for assistance. If you have been waiting for much longer than 20 minutes, contact Haveno support.
# suppress inspection "TrailingSpacesInProperty" # suppress inspection "TrailingSpacesInProperty"
portfolio.pending.step2.confReached=Your trade has reached 10 confirmations.\n\n portfolio.pending.step2.confReached=Your trade has reached 10 confirmations.\n\n
@ -689,7 +689,7 @@ portfolio.pending.step2_buyer.sellersAddress=Seller''s {0} address
portfolio.pending.step2_buyer.buyerAccount=Your payment account to be used portfolio.pending.step2_buyer.buyerAccount=Your payment account to be used
portfolio.pending.step2_buyer.paymentStarted=Payment started portfolio.pending.step2_buyer.paymentStarted=Payment started
portfolio.pending.step2_buyer.warn=You still have not done your {0} payment!\nPlease note that the trade has to be completed by {1}. portfolio.pending.step2_buyer.warn=You still have not done your {0} payment!\nPlease note that the trade has to be completed by {1}.
portfolio.pending.step2_buyer.openForDispute=You have not completed your payment yet\nThe max. period for the trade has elapsed, but you can still complete the payment.\ portfolio.pending.step2_buyer.openForDispute=You have not completed your payment yet\nThe max. period for the trade has elapsed, but you can still complete the payment.\n\
Contact an arbitrator if you need assistance. Contact an arbitrator if you need assistance.
portfolio.pending.step2_buyer.paperReceipt.headline=Did you send the paper receipt to the XMR seller? portfolio.pending.step2_buyer.paperReceipt.headline=Did you send the paper receipt to the XMR seller?
portfolio.pending.step2_buyer.paperReceipt.msg=Remember:\n\ portfolio.pending.step2_buyer.paperReceipt.msg=Remember:\n\
@ -866,16 +866,16 @@ portfolio.pending.openSupportTicket.msg=Please use this function only in emergen
handled by an arbitrator. handled by an arbitrator.
portfolio.pending.timeLockNotOver=You have to wait until ≈{0} ({1} more blocks) before you can open an arbitration dispute. portfolio.pending.timeLockNotOver=You have to wait until ≈{0} ({1} more blocks) before you can open an arbitration dispute.
portfolio.pending.error.depositTxNull=The deposit transaction is null. You cannot open a dispute \ portfolio.pending.error.depositTxNull=A deposit transaction is null. You cannot open a dispute \
without a valid deposit transaction. Please go to \"Settings/Network info\" and do a SPV resync.\n\n\ with an invalid deposit transaction.\n\n\
For further help please contact the Haveno support channel at the Haveno Keybase team. For further help, please contact Haveno support in our Matrix chatroom.
portfolio.pending.mediationResult.error.depositTxNull=The deposit transaction is null. You can move the \ portfolio.pending.mediationResult.error.depositTxNull=The deposit transaction is null. You can move the \
trade to failed trades. trade to failed trades.
portfolio.pending.mediationResult.error.delayedPayoutTxNull=The delayed payout transaction is null. You can move the \ portfolio.pending.mediationResult.error.delayedPayoutTxNull=The delayed payout transaction is null. You can move the \
trade to failed trades. trade to failed trades.
portfolio.pending.error.depositTxNotConfirmed=The deposit transaction is not confirmed. You can not open an arbitration dispute \ portfolio.pending.error.depositTxNotConfirmed=The deposit transactions are not confirmed and available. You cannot open an arbitration dispute \
with an unconfirmed deposit transaction. Please wait until it is confirmed or go to \"Settings/Network info\" and do a SPV resync.\n\n\ with a pending deposit transaction. Please wait until both deposit transasctions are confirmed and available.\n\n\
For further help please contact the Haveno support channel at the Haveno Keybase team. For further help, please contact Haveno support in our Matrix chatroom.
portfolio.pending.support.headline.getHelp=Need help? portfolio.pending.support.headline.getHelp=Need help?
portfolio.pending.support.button.getHelp=Open Trader Chat portfolio.pending.support.button.getHelp=Open Trader Chat

4
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java
View file

@ -273,9 +273,13 @@ public abstract class TradeStepView extends AnchorPane {
} }
private void openSupportTicket() { private void openSupportTicket() {
if (trade.getPhase().ordinal() < Trade.Phase.DEPOSITS_UNLOCKED.ordinal()) {
new Popup().warning(Res.get("portfolio.pending.error.depositTxNotConfirmed")).show();
} else {
applyOnDisputeOpened(); applyOnDisputeOpened();
model.dataModel.onOpenDispute(); model.dataModel.onOpenDispute();
} }
}
private void openChat() { private void openChat() {
// call up the chain to open chat // call up the chain to open chat