From 7f22ffedf93d07cf0aaa656e5474769ea4627163 Mon Sep 17 00:00:00 2001 From: MwithM <50149324+MwithM@users.noreply.github.com> Date: Wed, 1 Dec 2021 11:25:14 +0100 Subject: [PATCH 1/2] Substitute Unconfirmed for Processing BSQ swap **Unconfirmed** BSQ swap seems like something failed. **Processing** is used by some wallets for unconfirmed transactions and has no negative implications. --- .../main/resources/i18n/displayStrings.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 1cc275d92bf..2b6437e823e 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -576,7 +576,7 @@ takeOffer.success.info=You can see the status of your trade at \"Portfolio/Open takeOffer.error.message=An error occurred when taking the offer.\n\n{0} takeOffer.bsqSwap.success.headline=Your BSQ swap trade is completed -takeOffer.bsqSwap.success.info=You can see your completed trade at \"Portfolio/Unconfirmed BSQ Swaps\" +takeOffer.bsqSwap.success.info=You can see your completed trade at \"Portfolio/Processing BSQ Swaps\" # new entries takeOffer.takeOfferButton=Review: Take offer to {0} bitcoin @@ -652,7 +652,7 @@ bsqSwapOffer.feeHandling=Fee handling for BSQ swaps is different from normal Bis portfolio.tab.openOffers=My open offers portfolio.tab.pendingTrades=Open trades portfolio.tab.history=History -portfolio.tab.bsqSwap=Unconfirmed BSQ swaps +portfolio.tab.bsqSwap=Processing BSQ swaps portfolio.tab.failed=Failed portfolio.tab.editOpenOffer=Edit offer portfolio.tab.duplicateOffer=Duplicate offer @@ -2454,8 +2454,8 @@ dao.tx.bsqSwapTx=BSQ Swap transaction dao.tx.bsqSwapTrade=BSQ Swap trade: {0} -dao.proposal.create.missingBsqFunds=You don''t have sufficient BSQ funds for creating the proposal. If you have an \ - unconfirmed BSQ transaction you need to wait for a blockchain confirmation because BSQ is validated only if it is \ +dao.proposal.create.missingBsqFunds=You don''t have sufficient BSQ funds for creating the proposal. If you have a \ + processing BSQ transaction you need to wait for a blockchain confirmation because BSQ is validated only if it is \ included in a block.\n\ Missing: {0} @@ -3252,8 +3252,8 @@ navigation.funds.availableForWithdrawal=\"Funds/Send funds\" navigation.portfolio.myOpenOffers=\"Portfolio/My open offers\" navigation.portfolio.pending=\"Portfolio/Open trades\" navigation.portfolio.closedTrades=\"Portfolio/History\" -navigation.portfolio.bsqSwapTrades=\"Portfolio/Unconfirmed BSQ Swaps\" -navigation.portfolio.bsqSwapTrades.short=\"Unconfirmed BSQ Swaps\" +navigation.portfolio.bsqSwapTrades=\"Portfolio/Processing BSQ Swaps\" +navigation.portfolio.bsqSwapTrades.short=\"Processing BSQ Swaps\" navigation.funds.depositFunds=\"Funds/Receive funds\" navigation.settings.preferences=\"Settings/Preferences\" # suppress inspection "UnusedProperty" From 319a9d96a7c16431f3325bc90d08ade4061bea5f Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 6 Dec 2021 11:04:48 +0100 Subject: [PATCH 2/2] Improve BSQ swap success message --- .../main/resources/i18n/displayStrings.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 2b6437e823e..388c6040869 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -576,7 +576,7 @@ takeOffer.success.info=You can see the status of your trade at \"Portfolio/Open takeOffer.error.message=An error occurred when taking the offer.\n\n{0} takeOffer.bsqSwap.success.headline=Your BSQ swap trade is completed -takeOffer.bsqSwap.success.info=You can see your completed trade at \"Portfolio/Processing BSQ Swaps\" +takeOffer.bsqSwap.success.info=Until your trade is included in a block you can see your completed trade at \"Portfolio/Unconfirmed BSQ Swaps\" # new entries takeOffer.takeOfferButton=Review: Take offer to {0} bitcoin @@ -652,7 +652,7 @@ bsqSwapOffer.feeHandling=Fee handling for BSQ swaps is different from normal Bis portfolio.tab.openOffers=My open offers portfolio.tab.pendingTrades=Open trades portfolio.tab.history=History -portfolio.tab.bsqSwap=Processing BSQ swaps +portfolio.tab.bsqSwap=Unconfirmed BSQ swaps portfolio.tab.failed=Failed portfolio.tab.editOpenOffer=Edit offer portfolio.tab.duplicateOffer=Duplicate offer @@ -2454,8 +2454,8 @@ dao.tx.bsqSwapTx=BSQ Swap transaction dao.tx.bsqSwapTrade=BSQ Swap trade: {0} -dao.proposal.create.missingBsqFunds=You don''t have sufficient BSQ funds for creating the proposal. If you have a \ - processing BSQ transaction you need to wait for a blockchain confirmation because BSQ is validated only if it is \ +dao.proposal.create.missingBsqFunds=You don''t have sufficient BSQ funds for creating the proposal. If you have an \ + unconfirmed BSQ transaction you need to wait for a blockchain confirmation because BSQ is validated only if it is \ included in a block.\n\ Missing: {0} @@ -3252,8 +3252,8 @@ navigation.funds.availableForWithdrawal=\"Funds/Send funds\" navigation.portfolio.myOpenOffers=\"Portfolio/My open offers\" navigation.portfolio.pending=\"Portfolio/Open trades\" navigation.portfolio.closedTrades=\"Portfolio/History\" -navigation.portfolio.bsqSwapTrades=\"Portfolio/Processing BSQ Swaps\" -navigation.portfolio.bsqSwapTrades.short=\"Processing BSQ Swaps\" +navigation.portfolio.bsqSwapTrades=\"Portfolio/Unconfirmed BSQ Swaps\" +navigation.portfolio.bsqSwapTrades.short=\"Unconfirmed BSQ Swaps\" navigation.funds.depositFunds=\"Funds/Receive funds\" navigation.settings.preferences=\"Settings/Preferences\" # suppress inspection "UnusedProperty"