Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-19 03:38:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

support funding make or take offer directly

Browse source 
QR code encodes payment URI
security deposit absorbs miner fee up to 5%
use binary search to maximize security deposit and minimize dust
show itemized funding popup on create offer
This commit is contained in:
woodser 2022-12-03 14:33:55 +00:00
parent 4dbbcd6217
commit dd0a307a84
44 changed files with 263 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -451,7 +451,7 @@ createOffer.fundsBox.offerFee=Trade fee
createOffer.fundsBox.networkFee=Mining fee
createOffer.fundsBox.placeOfferSpinnerInfo=Offer publishing is in progress ...
createOffer.fundsBox.paymentLabel=Haveno trade with ID {0}
createOffer.fundsBox.fundsStructure=({0} security deposit, {1} trade fee, {2} mining fee)
createOffer.fundsBox.fundsStructure=({0} security deposit, {1} trade fee)
createOffer.success.headline=Your offer has been published
createOffer.success.info=You can manage your open offers at \"Portfolio/My open offers\".
createOffer.info.sellAtMarketPrice=You will always sell at market price as the price of your offer will be continuously updated.
@ -477,13 +477,11 @@ createOffer.createOfferFundWalletInfo.headline=Fund your offer
# suppress inspection "TrailingSpacesInProperty"
createOffer.createOfferFundWalletInfo.tradeAmount=- Trade amount: {0} \n
createOffer.createOfferFundWalletInfo.msg=You need to deposit {0} to this offer.\n\n\
Those funds are reserved in your local wallet and will get locked into the multisig deposit address once someone takes your offer.\n\n\
Those funds are reserved in your local wallet and will get locked into the multisig wallet once someone takes your offer.\n\n\
The amount is the sum of:\n\
{1}\
- Your security deposit: {2}\n\
- Trading fee: {3}\n\
- Mining fee: {4}\n\n\
You can choose between two options when funding your trade:\n- Use your Haveno wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup.
- Trading fee: {3}
# only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
createOffer.amountPriceBox.error.message=An error occurred when placing the offer:\n\n{0}\n\n\
@ -533,7 +531,7 @@ takeOffer.fundsBox.offerFee=Trade fee
takeOffer.fundsBox.networkFee=Total mining fees
takeOffer.fundsBox.takeOfferSpinnerInfo=Take offer in progress ...
takeOffer.fundsBox.paymentLabel=Haveno trade with ID {0}
takeOffer.fundsBox.fundsStructure=({0} security deposit, {1} trade fee, {2} mining fee)
takeOffer.fundsBox.fundsStructure=({0} security deposit, {1} trade fee)
takeOffer.success.headline=You have successfully taken an offer.
takeOffer.success.info=You can see the status of your trade at \"Portfolio/Open trades\".
takeOffer.error.message=An error occurred when taking the offer.\n\n{0}
@ -545,7 +543,7 @@ takeOffer.noPriceFeedAvailable=You cannot take that offer as it uses a percentag
takeOffer.takeOfferFundWalletInfo.headline=Fund your trade
# suppress inspection "TrailingSpacesInProperty"
takeOffer.takeOfferFundWalletInfo.tradeAmount=- Trade amount: {0} \n
takeOffer.takeOfferFundWalletInfo.msg=You need to deposit {0} for taking this offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Total mining fees: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Haveno wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup.
takeOffer.takeOfferFundWalletInfo.msg=You need to deposit {0} for taking this offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}
takeOffer.alreadyPaidInFunds=If you have already paid in funds you can withdraw it in the \"Funds/Send funds\" screen.
takeOffer.setAmountPrice=Set amount
takeOffer.alreadyFunded.askCancel=You have already funded that offer.\nIf you cancel now, your funds will be moved to your local Haveno wallet and are available for withdrawal in the \"Funds/Send funds\" screen.\nAre you sure you want to cancel?
@ -2242,9 +2240,6 @@ systemTray.tooltip=Haveno: A decentralized bitcoin exchange network
# GUI Util
####################################################################
guiUtil.miningFeeInfo=Please be sure that the mining fee used by your external wallet is \
at least {0} satoshis/vbyte. Otherwise, the trade transactions may not be confirmed in time and the trade will end up in a dispute.
guiUtil.accountExport.savedToPath=Trading accounts saved to path:\n{0}
guiUtil.accountExport.noAccountSetup=You don't have trading accounts set up for exporting.
guiUtil.accountExport.selectPath=Select path to {0}

2
core/src/main/resources/i18n/displayStrings_cs.properties
View file

@ -1710,8 +1710,6 @@ systemTray.tooltip=Bisq: Decentralizovaná směnárna bitcoinů
# GUI Util
####################################################################
guiUtil.miningFeeInfo=Ujistěte se, že poplatek za těžbu používaný vaší externí peněženkou je alespoň {0} satoshi/vbyte. Jinak nemusí být obchodní transakce potvrzeny včas a obchod skončí sporem.
guiUtil.accountExport.savedToPath=Obchodní účty uložené na:\n{0}
guiUtil.accountExport.noAccountSetup=Nemáte nastaveny obchodní účty pro export.
guiUtil.accountExport.selectPath=Vyberte cestu k {0}

2
core/src/main/resources/i18n/displayStrings_de.properties
View file

@ -1710,8 +1710,6 @@ systemTray.tooltip=Bisq: Ein dezentrales Bitcoin-Tauschbörsen-Netzwerk
# GUI Util
####################################################################
guiUtil.miningFeeInfo=Bitte stellen Sie sicher, dass die Mining-Gebühr für Ihre externe Wallet mindestens {0} satoshis/byte ist. Ansonsten wird die Transaktion des Trades nicht rechtzeitig bestätigt und der Trade wird in einem Konflikt enden.
guiUtil.accountExport.savedToPath=Handelskonten in Verzeichnis gespeichert:\n{0}
guiUtil.accountExport.noAccountSetup=Sie haben kein Handelskonto zum Exportieren eingerichtet.
guiUtil.accountExport.selectPath=Verzeichnis auswählen zum {0}

2
core/src/main/resources/i18n/displayStrings_es.properties
View file

@ -1710,8 +1710,6 @@ systemTray.tooltip=Bisq: Una red de intercambio de bitcoin descentralizada
# GUI Util
####################################################################
guiUtil.miningFeeInfo=Por favor asegúrese de que la comisión de minado usada en su monedero externo es de al menos {0} sat/vbyte. De lo contrario, las transacciones de intercambio podrían no confirmarse y el intercambio acabaría en disputa.
guiUtil.accountExport.savedToPath=Las cuentas de intercambio se han guardado en el directorio:\n{0}
guiUtil.accountExport.noAccountSetup=No tiene cuentas de intercambio configuradas para exportar.
guiUtil.accountExport.selectPath=Seleccionar directorio a {0}

2
core/src/main/resources/i18n/displayStrings_fa.properties
View file

@ -1710,8 +1710,6 @@ systemTray.tooltip=Bisq: A decentralized bitcoin exchange network
# GUI Util
####################################################################
guiUtil.miningFeeInfo=Please be sure that the mining fee used by your external wallet is at least {0} satoshis/vbyte. Otherwise the trade transactions may not be confirmed in time and the trade will end up in a dispute.
guiUtil.accountExport.savedToPath=حساب های معاملاتی در مسیر ذیل ذخیره شد:\n{0}
guiUtil.accountExport.noAccountSetup=شما حساب های معاملاتی برای صادرات ندارید.
guiUtil.accountExport.selectPath=انتخاب مسیر به {0}

2
core/src/main/resources/i18n/displayStrings_fr.properties
View file

@ -1711,8 +1711,6 @@ systemTray.tooltip=Bisq: Une plateforme d''échange décentralisée sur le rése
# GUI Util
####################################################################
guiUtil.miningFeeInfo=Veuillez vous assurer que les frais de minage utilisés par votre portefeuille externe sont d'au moins {0} satoshis/vbyte. Le cas échéant les transactions de trade pourraient ne peut être confirmée à temps et le trade aboutirait à une dispute.
guiUtil.accountExport.savedToPath=Les comptes de trading sont sauvegardés vers l''arborescence:\n{0}
guiUtil.accountExport.noAccountSetup=Vous n'avez pas de comptes de trading configurés pour exportation.
guiUtil.accountExport.selectPath=Sélectionner l''arborescence vers {0}

2
core/src/main/resources/i18n/displayStrings_it.properties
View file

@ -1710,8 +1710,6 @@ systemTray.tooltip=Bisq: una rete di scambio decentralizzata di bitcoin
# GUI Util
####################################################################
guiUtil.miningFeeInfo=Please be sure that the mining fee used by your external wallet is at least {0} satoshis/vbyte. Otherwise the trade transactions may not be confirmed in time and the trade will end up in a dispute.
guiUtil.accountExport.savedToPath=Account di trading salvati nel percorso:\n{0}
guiUtil.accountExport.noAccountSetup=Non hai account di trading impostati per l'esportazione.
guiUtil.accountExport.selectPath=Seleziona il percorso per {0}

2
core/src/main/resources/i18n/displayStrings_ja.properties
View file

@ -1710,8 +1710,6 @@ systemTray.tooltip=Bisq: 分散的ビットコイン取引ネットワーク
# GUI Util
####################################################################
guiUtil.miningFeeInfo=外部ウォレットで使用されるマイニング手数料が少なくとも{0} satoshis/vbyte あることを確認してください。 そうでなければ、このトレードトランザクションは承認されない可能性、トレードは係争に終わる可能性があります。
guiUtil.accountExport.savedToPath=取引アカウントを下記パスに保存しました:\n{0}
guiUtil.accountExport.noAccountSetup=取引アカウントのエクスポート設定がされていません
guiUtil.accountExport.selectPath={0}のパスを選択

2
core/src/main/resources/i18n/displayStrings_pt-br.properties
View file

@ -1718,8 +1718,6 @@ systemTray.tooltip=Bisq: a rede de exchange decentralizada de bitcoin
# GUI Util
####################################################################
guiUtil.miningFeeInfo=Please be sure that the mining fee used by your external wallet is at least {0} satoshis/vbyte. Otherwise the trade transactions may not be confirmed in time and the trade will end up in a dispute.
guiUtil.accountExport.savedToPath=Contas de negociação salvas na pasta:\n{0}
guiUtil.accountExport.noAccountSetup=Você não tem contas de negociação para exportar.
guiUtil.accountExport.selectPath=Selecione pasta de {0}

2
core/src/main/resources/i18n/displayStrings_pt.properties
View file

@ -1708,8 +1708,6 @@ systemTray.tooltip=Bisq: Uma rede de echange de bitcoin descentralizada
# GUI Util
####################################################################
guiUtil.miningFeeInfo=Please be sure that the mining fee used by your external wallet is at least {0} satoshis/vbyte. Otherwise the trade transactions may not be confirmed in time and the trade will end up in a dispute.
guiUtil.accountExport.savedToPath=Contas de negociação guardadas em:\n{0}
guiUtil.accountExport.noAccountSetup=Você não tem contas de negociação prontas para exportar.
guiUtil.accountExport.selectPath=Selecione diretório de {0}

2
core/src/main/resources/i18n/displayStrings_ru.properties
View file

@ -1710,8 +1710,6 @@ systemTray.tooltip=Bisq: A decentralized bitcoin exchange network
# GUI Util
####################################################################
guiUtil.miningFeeInfo=Please be sure that the mining fee used by your external wallet is at least {0} satoshis/vbyte. Otherwise the trade transactions may not be confirmed in time and the trade will end up in a dispute.
guiUtil.accountExport.savedToPath=Торговые счета в:\n{0}
guiUtil.accountExport.noAccountSetup=У вас нет торговых счетов для экспортирования.
guiUtil.accountExport.selectPath=Выбрать путь к {0}

2
core/src/main/resources/i18n/displayStrings_th.properties
View file

@ -1710,8 +1710,6 @@ systemTray.tooltip=Bisq: A decentralized bitcoin exchange network
# GUI Util
####################################################################
guiUtil.miningFeeInfo=Please be sure that the mining fee used by your external wallet is at least {0} satoshis/vbyte. Otherwise the trade transactions may not be confirmed in time and the trade will end up in a dispute.
guiUtil.accountExport.savedToPath=บัญชีการค้าที่บันทึกไว้ในเส้นทาง: \n{0}
guiUtil.accountExport.noAccountSetup=คุณไม่มีบัญชีการซื้อขายที่ตั้งค่าไว้สำหรับการส่งออก
guiUtil.accountExport.selectPath=เลือกเส้นทางไปที่ {0}

2
core/src/main/resources/i18n/displayStrings_vi.properties
View file

@ -1712,8 +1712,6 @@ systemTray.tooltip=Bisq: A decentralized bitcoin exchange network
# GUI Util
####################################################################
guiUtil.miningFeeInfo=Please be sure that the mining fee used by your external wallet is at least {0} satoshis/vbyte. Otherwise the trade transactions may not be confirmed in time and the trade will end up in a dispute.
guiUtil.accountExport.savedToPath=tài khoản giao dịch được lưu vào đường dẫn:\n{0}
guiUtil.accountExport.noAccountSetup=Bạn không có tài khoản giao dịch được thiết lập để truy xuất.
guiUtil.accountExport.selectPath=Chọn đường dẫn đến {0}

2
core/src/main/resources/i18n/displayStrings_zh-hans.properties
View file

@ -1714,8 +1714,6 @@ systemTray.tooltip=Bisq：去中心化比特币交易网络
# GUI Util
####################################################################
guiUtil.miningFeeInfo=请确保您的外部钱包使用的矿工手续费费用足够高至少为 {0} 聪/字节，以便矿工接受资金交易。\n否则交易所交易无法确认，交易最终将会出现纠纷。
guiUtil.accountExport.savedToPath=交易账户保存在路径：\n{0}
guiUtil.accountExport.noAccountSetup=您没有交易账户设置导出。
guiUtil.accountExport.selectPath=选择路径 {0}

2
core/src/main/resources/i18n/displayStrings_zh-hant.properties
View file

@ -1710,8 +1710,6 @@ systemTray.tooltip=Bisq：去中心化比特幣交易網絡
# GUI Util
####################################################################
guiUtil.miningFeeInfo=請確保您的外部錢包使用的礦工手續費費用足夠高至少為 {0} 聰/字節，以便礦工接受資金交易。\n否則交易所交易無法確認，交易最終將會出現糾紛。
guiUtil.accountExport.savedToPath=交易賬户保存在路徑：\n{0}
guiUtil.accountExport.noAccountSetup=您沒有交易賬户設置導出。
guiUtil.accountExport.selectPath=選擇路徑 {0}