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

Merge branch 'haveno-dex:master' into master

Browse source
This commit is contained in:
boldsuck 2025-01-07 15:01:11 +01:00 committed by GitHub
commit 3cb68ffd41
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 1744 additions and 521 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2702,9 +2702,9 @@ payment.account.revolut.addUserNameInfo={0}\n\
This will not affect your account age signing status.
payment.revolut.addUserNameInfo.headLine=Update Revolut account
payment.cashapp.info=Cash App has higher chargeback risk than most bank transfers. Please be aware of this when trading with Cash App.
payment.venmo.info=Venmo has higher chargeback risk than most bank transfers. Please be aware of this when trading with Venmo.
payment.paypal.info=PayPal has higher chargeback risk than most bank transfers. Please be aware of this when trading with PayPal.
payment.cashapp.info=Please be aware that Cash App has higher chargeback risk than most bank transfers.
payment.venmo.info=Please be aware that Venmo has higher chargeback risk than most bank transfers.
payment.paypal.info=Please be aware that PayPal has higher chargeback risk than most bank transfers.
payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
payment.account.amazonGiftCard.addCountryInfo={0}\n\

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

File diff suppressed because it is too large Load diff

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

@ -1631,7 +1631,7 @@ popup.warning.nodeBanned=Einer der {0} Nodes wurde gebannt.
popup.warning.priceRelay=Preisrelais
popup.warning.seed=Seed
popup.warning.mandatoryUpdate.trading=Bitte aktualisieren Sie auf die neueste Haveno-Version. Es wurde ein obligatorisches Update veröffentlicht, das den Handel mit alten Versionen deaktiviert. Bitte besuchen Sie das Haveno-Forum für weitere Informationen.
popup.warning.noFilter=Wir haben kein Filterobjekt von den Seed Nodes erhalten. Diese Situation ist unerwartet. Bitte informieren Sie die Haveno Entwickler.
popup.warning.noFilter=Wir haben kein Filterobjekt von den Seed-Knoten erhalten. Bitte informieren Sie die Netzwerkadministratoren, ein Filterobjekt zu registrieren.
popup.warning.burnXMR=Die Transaktion ist nicht möglich, da die Mininggebühren von {0} den übertragenen Betrag von {1} überschreiten würden. Bitte warten Sie, bis die Gebühren wieder niedrig sind, oder Sie mehr XMR zum übertragen angesammelt haben.
popup.warning.openOffer.makerFeeTxRejected=Die Verkäufergebühren-Transaktion für das Angebot mit der ID {0} wurde vom Monero-Netzwerk abgelehnt.\nTransaktions-ID={1}.\nDas Angebot wurde entfernt, um weitere Probleme zu vermeiden.\nBitte gehen Sie zu \"Einstellungen/Netzwerkinformationen\" und führen Sie eine SPV-Resynchronisierung durch.\nFür weitere Hilfe wenden Sie sich bitte an den Haveno-Support-Kanal des Haveno Keybase Teams.
@ -1995,6 +1995,10 @@ payment.revolut.info=Revolut benötigt den "Benutzernamen" als Account ID und ni
payment.account.revolut.addUserNameInfo={0}\nDein existierendes Revolut Konto ({1}) hat keinen "Benutzernamen".\nBitte geben Sie Ihren Revolut "Benutzernamen" ein um Ihre Kontodaten zu aktualisieren.\nDas wird Ihr Kontoalter und die Verifizierung nicht beeinflussen.
payment.revolut.addUserNameInfo.headLine=Revolut Account updaten
payment.cashapp.info=Bitte beachten Sie, dass Cash App ein höheres Rückbuchungsrisiko hat als die meisten Banküberweisungen.
payment.venmo.info=Bitte beachten Sie, dass Venmo ein höheres Rückbuchungsrisiko hat als die meisten Banküberweisungen.
payment.paypal.info=Bitte beachten Sie, dass PayPal ein höheres Rückbuchungsrisiko hat als die meisten Banküberweisungen.
payment.amazonGiftCard.upgrade=Bei der Zahlungsmethode Amazon Geschenkkarten muss das Land angegeben werden.
payment.account.amazonGiftCard.addCountryInfo={0}\nDein bestehendes Amazon Geschenkkarten Konto ({1}) wurde keinem Land zugeteilt.\nBitte geben Sie das Amazon Geschenkkarten Land ein um Ihre Kontodaten zu aktualisieren.\nDas wird ihr Kontoalter nicht beeinflussen.
payment.amazonGiftCard.upgrade.headLine=Amazon Geschenkkarte Konto updaten

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

@ -1632,7 +1632,7 @@ popup.warning.nodeBanned=Uno de los nodos {0} ha sido baneado.
popup.warning.priceRelay=retransmisión de precio
popup.warning.seed=semilla
popup.warning.mandatoryUpdate.trading=Por favor, actualice a la última versión de Haveno. Se lanzó una actualización obligatoria que inhabilita intercambios con versiones anteriores. Por favor, lea el Foro de Haveno para más información\n
popup.warning.noFilter=No hemos recibido un objeto de filtro desde los nodos semilla. Esta situación no se esperaba. Por favor, informe a los desarrolladores Haveno.
popup.warning.noFilter=No recibimos un objeto de filtro de los nodos semilla. Por favor, informe a los administradores de la red que registren un objeto de filtro.
popup.warning.burnXMR=Esta transacción no es posible, ya que las comisiones de minado de {0} excederían la cantidad a transferir de {1}. Por favor, espere a que las comisiones de minado bajen o hasta que haya acumulado más XMR para transferir.
popup.warning.openOffer.makerFeeTxRejected=La tasa de transacción para la oferta con ID {0} se rechazó por la red Monero.\nID de transacción={1}\nLa oferta se ha eliminado para evitar futuros problemas.\nPor favor vaya a \"Configuración/Información de red\" y haga una resincronización SPV.\nPara más ayuda por favor contacte con el equipo de soporte de Haveno en el canal de Haveno en Keybase.
@ -1996,6 +1996,10 @@ payment.revolut.info=Revolut requiere el 'nombre de usuario' como ID de cuenta y
payment.account.revolut.addUserNameInfo={0}\nSu cuenta de Revolut ({1}) no tiene un "nombre de usuario".\nPor favor introduzca su "nombre de usuario" en Revolut para actualizar sus datos de cuenta.\nEsto no afectará a su estado de edad de firmado de cuenta.
payment.revolut.addUserNameInfo.headLine=Actualizar cuenta Revolut
payment.cashapp.info=Tenga en cuenta que Cash App tiene un mayor riesgo de contracargos que la mayoría de las transferencias bancarias.
payment.venmo.info=Tenga en cuenta que Venmo tiene un mayor riesgo de contracargos que la mayoría de las transferencias bancarias.
payment.paypal.info=Tenga en cuenta que PayPal tiene un mayor riesgo de contracargos que la mayoría de las transferencias bancarias.
payment.amazonGiftCard.upgrade=El método de pago Tarjetas regalo Amazon requiere que se especifique el país
payment.account.amazonGiftCard.addCountryInfo={0}\nSu cuenta actual de Tarjeta regalo Amazon ({1}) no tiene un País especificado.\nPor favor introduzca el país de su Tarjeta regalo Amazon para actualizar sus datos de cuenta.\nEsto no afectará el estatus de edad de su cuenta.
payment.amazonGiftCard.upgrade.headLine=Actualizar cuenta Tarjeta regalo Amazon

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

@ -1627,6 +1627,7 @@ popup.warning.nodeBanned=One of the {0} nodes got banned.
popup.warning.priceRelay=رله قیمت
popup.warning.seed=دانه
popup.warning.mandatoryUpdate.trading=Please update to the latest Haveno version. A mandatory update was released which disables trading for old versions. Please check out the Haveno Forum for more information.
popup.warning.noFilter=ما شیء فیلتر را از گره‌های اولیه دریافت نکردیم. لطفاً به مدیران شبکه اطلاع دهید که یک شیء فیلتر ثبت کنند.
popup.warning.burnXMR=This transaction is not possible, as the mining fees of {0} would exceed the amount to transfer of {1}. Please wait until the mining fees are low again or until you''ve accumulated more XMR to transfer.
popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Monero network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team.
@ -1988,6 +1989,10 @@ payment.revolut.info=Revolut requires the 'Username' as account ID not the phone
payment.account.revolut.addUserNameInfo={0}\nYour existing Revolut account ({1}) does not have a ''Username''.\nPlease enter your Revolut ''Username'' to update your account data.\nThis will not affect your account age signing status.
payment.revolut.addUserNameInfo.headLine=Update Revolut account
payment.cashapp.info=لطفاً توجه داشته باشید که Cash App ریسک بازپرداخت بالاتری نسبت به بیشتر انتقالات بانکی دارد.
payment.venmo.info=لطفاً توجه داشته باشید که Venmo ریسک بازپرداخت بالاتری نسبت به بیشتر انتقالات بانکی دارد.
payment.paypal.info=لطفاً توجه داشته باشید که PayPal ریسک بازپرداخت بالاتری نسبت به بیشتر انتقالات بانکی دارد.
payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

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

@ -1633,7 +1633,7 @@ popup.warning.nodeBanned=Un des noeuds {0} a été banni.
popup.warning.priceRelay=Relais de prix
popup.warning.seed=seed
popup.warning.mandatoryUpdate.trading=Veuillez faire une mise à jour vers la dernière version de Haveno. Une mise à jour obligatoire a été publiée, laquelle désactive le trading sur les anciennes versions. Veuillez consulter le Forum Haveno pour obtenir plus d'informations.
popup.warning.noFilter=Nous n'avons pas reçu d'object de filtre de la part des noeuds source. Ceci n'est pas une situation attendue. Veuillez informer les développeurs de Haveno
popup.warning.noFilter=Nous n'avons pas reçu d'objet de filtre des nœuds de seed. Veuillez informer les administrateurs du réseau d'enregistrer un objet de filtre.
popup.warning.burnXMR=Cette transaction n''est pas possible, car les frais de minage de {0} dépasseraient le montant à transférer de {1}. Veuillez patienter jusqu''à ce que les frais de minage soient de nouveau bas ou jusqu''à ce que vous ayez accumulé plus de XMR à transférer.
popup.warning.openOffer.makerFeeTxRejected=La transaction de frais de maker pour l''offre avec ID {0} a été rejetée par le réseau Monero.\nID de transaction={1}.\nL''offre a été retirée pour éviter d''autres problèmes.\nAllez dans \"Paramètres/Info sur le réseau réseau\" et faites une resynchronisation SPV.\nPour obtenir de l''aide, le canal support de l''équipe Haveno disposible sur Keybase.
@ -1997,6 +1997,10 @@ payment.revolut.info=Revolut nécessite le 'Nom d'utilisateur' en tant qu'ID de
payment.account.revolut.addUserNameInfo={0}\nVotre compte Revolut existant ({1}) n'a pas de "Nom d'utilisateur".\nVeuillez entrer votre "Nom d'utilisateur" Revolut pour mettre à jour les données de votre compte.\nCeci n'affectera pas l'âge du compte.
payment.revolut.addUserNameInfo.headLine=Mettre à jour le compte Revolut
payment.cashapp.info=Veuillez noter que Cash App présente un risque de rétrofacturation plus élevé que la plupart des virements bancaires.
payment.venmo.info=Veuillez noter que Venmo présente un risque de rétrofacturation plus élevé que la plupart des virements bancaires.
payment.paypal.info=Veuillez noter que PayPal présente un risque de rétrofacturation plus élevé que la plupart des virements bancaires.
payment.amazonGiftCard.upgrade=La méthode de paiement via carte cadeaux Amazon nécessite que le pays soit spécifié.
payment.account.amazonGiftCard.addCountryInfo={0}\nVotre compte carte cadeau Amazon existant ({1}) n'a pas de pays spécifé.\nVeuillez entrer le pays de votre compte carte cadeau Amazon pour mettre à jour les données de votre compte.\nCeci n'affectera pas le statut de l'âge du compte.
payment.amazonGiftCard.upgrade.headLine=Mettre à jour le compte des cartes cadeaux Amazon

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

@ -1630,6 +1630,7 @@ popup.warning.nodeBanned=One of the {0} nodes got banned.
popup.warning.priceRelay=ripetitore di prezzo
popup.warning.seed=seme
popup.warning.mandatoryUpdate.trading=Si prega di aggiornare Haveno all'ultima versione. È stato rilasciato un aggiornamento obbligatorio che disabilita il trading per le vecchie versioni. Per ulteriori informazioni, consultare il forum Haveno.
popup.warning.noFilter=Non abbiamo ricevuto un oggetto filtro dai nodi seme. Si prega di informare gli amministratori di rete di registrare un oggetto filtro.
popup.warning.burnXMR=Questa transazione non è possibile, poiché le commissioni di mining di {0} supererebbero l'importo da trasferire di {1}. Attendi fino a quando le commissioni di mining non saranno nuovamente basse o fino a quando non avrai accumulato più XMR da trasferire.
popup.warning.openOffer.makerFeeTxRejected=La commissione della transazione del creatore dell'offerta con ID {0} è stata rifiutata dalla rete Monero.\nTransazione ID={1}.\nL'offerta è stata rimossa per evitare ulteriori problemi.\nVai su \"Impostazioni/Informazioni di rete\" ed esegui una risincronizzazione SPV.\nPer ulteriore assistenza, contattare il canale di supporto Haveno nel team di Haveno Keybase.
@ -1991,6 +1992,10 @@ payment.revolut.info=Revolut requires the 'Username' as account ID not the phone
payment.account.revolut.addUserNameInfo={0}\nYour existing Revolut account ({1}) does not have a ''Username''.\nPlease enter your Revolut ''Username'' to update your account data.\nThis will not affect your account age signing status.
payment.revolut.addUserNameInfo.headLine=Update Revolut account
payment.cashapp.info=Si prega di notare che Cash App ha un rischio di chargeback più elevato rispetto alla maggior parte dei bonifici bancari.
payment.venmo.info=Si prega di notare che Venmo ha un rischio di chargeback più elevato rispetto alla maggior parte dei bonifici bancari.
payment.paypal.info=Si prega di notare che PayPal ha un rischio di chargeback più elevato rispetto alla maggior parte dei bonifici bancari.
payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

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

@ -1631,6 +1631,7 @@ popup.warning.nodeBanned={0}ノードの1つが禁止されました。
popup.warning.priceRelay=価格中継
popup.warning.seed=シード
popup.warning.mandatoryUpdate.trading=最新のHavenoバージョンに更新してください。古いバージョンのトレードを無効にする必須の更新プログラムがリリースされました。詳細については、Havenoフォーラムをご覧ください。
popup.warning.noFilter=シードノードからフィルターオブジェクトを受け取っていません。ネットワーク管理者にフィルターオブジェクトを登録するように通知してください。
popup.warning.burnXMR={0}のマイニング手数料が{1}の送金額を超えるため、このトランザクションは利用不可です。マイニング手数料が再び低くなるか、送金するXMRがさらに蓄積されるまでお待ちください。
popup.warning.openOffer.makerFeeTxRejected=ID{0}で識別されるオファーのためのメイカー手数料トランザクションがビットコインネットワークに拒否されました。\nトランザクションID= {1} 。\n更なる問題を避けるため、そのオファーは削除されました。\n\"設定/ネットワーク情報\"を開いてSPV再同期を行って下さい。\nさらにサポートを受けるため、Haveno Keybaseチームのサポートチャンネルに連絡して下さい。
@ -1994,6 +1995,10 @@ payment.revolut.info=以前の場合と違って、Revolutは電話番号やメ
payment.account.revolut.addUserNameInfo={0}\n現在の「Revolut」アカウント（{1}）には「ユーザ名」がありません。 \nアカウントデータを更新するのにRevolutの「ユーザ名」を入力して下さい。\nアカウント年齢署名状況に影響を及ぼしません。
payment.revolut.addUserNameInfo.headLine=Revolutアカウントをアップデートする
payment.cashapp.info=Cash App はほとんどの銀行振込よりもチャージバックリスクが高いことにご注意ください。
payment.venmo.info=Venmo はほとんどの銀行振込よりもチャージバックリスクが高いことにご注意ください。
payment.paypal.info=PayPal はほとんどの銀行振込よりもチャージバックリスクが高いことにご注意ください。
payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

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

@ -1637,6 +1637,7 @@ popup.warning.nodeBanned=One of the {0} nodes got banned.
popup.warning.priceRelay=transmissão de preço
popup.warning.seed=semente
popup.warning.mandatoryUpdate.trading=Faça o update para a última versão do Haveno. Um update obrigatório foi lançado e desabilita negociações em versões antigas. Por favor, veja o Fórum do Haveno para mais informações.
popup.warning.noFilter=Não recebemos um objeto de filtro dos nós seed. Por favor, informe aos administradores da rede para registrar um objeto de filtro.
popup.warning.burnXMR=Esta transação não é possível, pois as taxas de mineração de {0} excederiam o montante a transferir de {1}. Aguarde até que as taxas de mineração estejam novamente baixas ou até você ter acumulado mais XMR para transferir.
popup.warning.openOffer.makerFeeTxRejected=A transação de taxa de ofertante para a oferta com ID {0} foi rejeitada pela rede Monero.\nID da transação: {1}.\nA oferta foi removida para evitar problemas adicionais.\nPor favor, vá até "Configurações/Informações da rede" e ressincronize o arquivo SPV.\nPara mais informações, por favor acesse o canal #support do time da Haveno na Keybase.
@ -1998,6 +1999,10 @@ payment.revolut.info=Revolut requires the 'Username' as account ID not the phone
payment.account.revolut.addUserNameInfo={0}\nYour existing Revolut account ({1}) does not have a ''Username''.\nPlease enter your Revolut ''Username'' to update your account data.\nThis will not affect your account age signing status.
payment.revolut.addUserNameInfo.headLine=Update Revolut account
payment.cashapp.info=Por favor, esteja ciente de que o Cash App tem um risco maior de estorno do que a maioria das transferências bancárias.
payment.venmo.info=Por favor, esteja ciente de que o Venmo tem um risco maior de estorno do que a maioria das transferências bancárias.
payment.paypal.info=Por favor, esteja ciente de que o PayPal tem um risco maior de estorno do que a maioria das transferências bancárias.
payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

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

@ -1627,6 +1627,7 @@ popup.warning.nodeBanned=One of the {0} nodes got banned.
popup.warning.priceRelay=transmissão de preço
popup.warning.seed=semente
popup.warning.mandatoryUpdate.trading=Por favor, atualize para a versão mais recente do Haveno. Uma atualização obrigatória que desativa negociação para versões antigas foi lançada. Por favor, confira o Fórum Haveno para mais informações.
popup.warning.noFilter=Não recebemos um objeto de filtro dos nós sementes. Por favor, informe os administradores da rede para registrar um objeto de filtro.
popup.warning.burnXMR=Esta transação não é possível, pois as taxas de mineração de {0} excederia o montante a transferir de {1}. Aguarde até que as taxas de mineração estejam novamente baixas ou até você ter acumulado mais XMR para transferir.
popup.warning.openOffer.makerFeeTxRejected=A transação da taxa de ofertante para a oferta com o ID {0} foi rejeitada pela rede do Monero.\nID da transação={1}.\nA oferta foi removida para evitar futuros problemas.\nPor favor vá à \"Definições/Informação da Rede\" e re-sincronize o ficheiro SPV.\nPara mais ajuda por favor contacte o canal de apoio do Haveno na equipa Keybase do Haveno.
@ -1988,6 +1989,10 @@ payment.revolut.info=Revolut requires the 'Username' as account ID not the phone
payment.account.revolut.addUserNameInfo={0}\nYour existing Revolut account ({1}) does not have a ''Username''.\nPlease enter your Revolut ''Username'' to update your account data.\nThis will not affect your account age signing status.
payment.revolut.addUserNameInfo.headLine=Update Revolut account
payment.cashapp.info=Esteja ciente de que o Cash App tem um risco de estorno maior do que a maioria das transferências bancárias.
payment.venmo.info=Esteja ciente de que o Venmo tem um risco de estorno maior do que a maioria das transferências bancárias.
payment.paypal.info=Esteja ciente de que o PayPal tem um risco de estorno maior do que a maioria das transferências bancárias.
payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

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

@ -1628,6 +1628,7 @@ popup.warning.nodeBanned=One of the {0} nodes got banned.
popup.warning.priceRelay=ретранслятор курса
popup.warning.seed=мнемоническая фраза
popup.warning.mandatoryUpdate.trading=Обновите Haveno до последней версии. Вышло обязательное обновление, которое делает невозможной торговлю в старых версиях приложения. Посетите форум Haveno, чтобы узнать подробности.
popup.warning.noFilter=Мы не получили объект фильтра от узлов-источников. Пожалуйста, сообщите администраторам сети, чтобы они зарегистрировали объект фильтра.
popup.warning.burnXMR=Данную транзакцию невозможно завершить, так как плата за нее ({0}) превышает сумму перевода ({1}). Подождите, пока плата за транзакцию не снизится или пока у вас не появится больше XMR для завершения перевода.
popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Monero network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team.
@ -1989,6 +1990,10 @@ payment.revolut.info=Revolut requires the 'Username' as account ID not the phone
payment.account.revolut.addUserNameInfo={0}\nYour existing Revolut account ({1}) does not have a ''Username''.\nPlease enter your Revolut ''Username'' to update your account data.\nThis will not affect your account age signing status.
payment.revolut.addUserNameInfo.headLine=Update Revolut account
payment.cashapp.info=Обратите внимание, что Cash App имеет более высокий риск возврата платежей, чем большинство банковских переводов.
payment.venmo.info=Обратите внимание, что Venmo имеет более высокий риск возврата платежей, чем большинство банковских переводов.
payment.paypal.info=Обратите внимание, что PayPal имеет более высокий риск возврата платежей, чем большинство банковских переводов.
payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

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

@ -1628,6 +1628,7 @@ popup.warning.nodeBanned=One of the {0} nodes got banned.
popup.warning.priceRelay=ราคาผลัดเปลี่ยน
popup.warning.seed=รหัสลับเพื่อกู้ข้อมูล
popup.warning.mandatoryUpdate.trading=Please update to the latest Haveno version. A mandatory update was released which disables trading for old versions. Please check out the Haveno Forum for more information.
popup.warning.noFilter=เราไม่ได้รับวัตถุกรองจากโหนดต้นทาง กรุณาแจ้งผู้ดูแลระบบเครือข่ายให้ลงทะเบียนวัตถุกรอง
popup.warning.burnXMR=This transaction is not possible, as the mining fees of {0} would exceed the amount to transfer of {1}. Please wait until the mining fees are low again or until you''ve accumulated more XMR to transfer.
popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Monero network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team.
@ -1989,6 +1990,10 @@ payment.revolut.info=Revolut requires the 'Username' as account ID not the phone
payment.account.revolut.addUserNameInfo={0}\nYour existing Revolut account ({1}) does not have a ''Username''.\nPlease enter your Revolut ''Username'' to update your account data.\nThis will not affect your account age signing status.
payment.revolut.addUserNameInfo.headLine=Update Revolut account
payment.cashapp.info=โปรดทราบว่า Cash App มีความเสี่ยงในการเรียกเงินคืนสูงกว่าการโอนเงินผ่านธนาคารส่วนใหญ่
payment.venmo.info=โปรดทราบว่า Venmo มีความเสี่ยงในการเรียกเงินคืนสูงกว่าการโอนเงินผ่านธนาคารส่วนใหญ่
payment.paypal.info=โปรดทราบว่า PayPal มีความเสี่ยงในการเรียกเงินคืนสูงกว่าการโอนเงินผ่านธนาคารส่วนใหญ่
payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

8
core/src/main/resources/i18n/displayStrings_tr.properties
View file

@ -2160,7 +2160,7 @@ popup.warning.seed=anahtar kelime
popup.warning.mandatoryUpdate.trading=Lütfen en son Haveno sürümüne güncelleyin. \
Eski sürümler için ticareti devre dışı bırakan zorunlu bir güncelleme yayınlandı. \
Daha fazla bilgi için lütfen Haveno Forumunu kontrol edin.
popup.warning.noFilter=Tohum düğümlerinden bir filtre nesnesi almadık. Lütfen Haveno ağ yöneticilerini bir filtre nesnesi kaydetmek için ctrl + f ile bilgilendirin.
popup.warning.noFilter=Tohum düğümlerinden bir filtre nesnesi almadık. Lütfen ağ yöneticilerine bir filtre nesnesi kaydetmeleri için bilgi verin.
popup.warning.burnXMR=Bu işlem mümkün değil, çünkü {0} tutarındaki madencilik ücretleri, transfer edilecek {1} tutarını aşacaktır. \
Lütfen madencilik ücretleri tekrar düşük olana kadar bekleyin veya transfer etmek için daha fazla XMR biriktirin.
@ -2689,9 +2689,9 @@ payment.account.revolut.addUserNameInfo={0}\n\
Bu, hesap yaş imza durumunuzu etkilemeyecektir.
payment.revolut.addUserNameInfo.headLine=Revolut hesabını güncelle
payment.cashapp.info=Cash App, çoğu banka transferine göre daha yüksek geri ödeme riskine sahiptir. Cash App ile ticaret yaparken bunun farkında olun.
payment.venmo.info=Venmo, çoğu banka transferine göre daha yüksek geri ödeme riskine sahiptir. Venmo ile ticaret yaparken bunun farkında olun.
payment.paypal.info=PayPal, çoğu banka transferine göre daha yüksek geri ödeme riskine sahiptir. PayPal ile ticaret yaparken bunun farkında olun.
payment.cashapp.info=Lütfen Cash App'in çoğu banka transferinden daha yüksek geri ödeme riski taşıdığını unutmayın.
payment.venmo.info=Lütfen Venmo'nun çoğu banka transferinden daha yüksek geri ödeme riski taşıdığını unutmayın.
payment.paypal.info=Lütfen PayPal'in çoğu banka transferinden daha yüksek geri ödeme riski taşıdığını unutmayın.
payment.amazonGiftCard.upgrade=Amazon hediye kartları ödeme yöntemi için ülkenin belirtilmesi gerekmektedir.
payment.account.amazonGiftCard.addCountryInfo={0}\n\

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

@ -1630,6 +1630,7 @@ popup.warning.nodeBanned=One of the {0} nodes got banned.
popup.warning.priceRelay=rơle giá
popup.warning.seed=seed
popup.warning.mandatoryUpdate.trading=Please update to the latest Haveno version. A mandatory update was released which disables trading for old versions. Please check out the Haveno Forum for more information.
popup.warning.noFilter=Chúng tôi không nhận được đối tượng bộ lọc từ các nút hạt giống. Vui lòng thông báo cho quản trị viên mạng để đăng ký một đối tượng bộ lọc.
popup.warning.burnXMR=Không thể thực hiện giao dịch, vì phí đào {0} vượt quá số lượng {1} cần chuyển. Vui lòng chờ tới khi phí đào thấp xuống hoặc khi bạn tích lũy đủ XMR để chuyển.
popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Monero network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Haveno support channel at the Haveno Keybase team.
@ -1991,6 +1992,10 @@ payment.revolut.info=Revolut requires the 'Username' as account ID not the phone
payment.account.revolut.addUserNameInfo={0}\nYour existing Revolut account ({1}) does not have a ''Username''.\nPlease enter your Revolut ''Username'' to update your account data.\nThis will not affect your account age signing status.
payment.revolut.addUserNameInfo.headLine=Update Revolut account
payment.cashapp.info=Vui lòng lưu ý rằng Cash App có rủi ro bồi hoàn cao hơn so với hầu hết các chuyển khoản ngân hàng.
payment.venmo.info=Vui lòng lưu ý rằng Venmo có rủi ro bồi hoàn cao hơn so với hầu hết các chuyển khoản ngân hàng.
payment.paypal.info=Vui lòng lưu ý rằng PayPal có rủi ro bồi hoàn cao hơn so với hầu hết các chuyển khoản ngân hàng.
payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

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

@ -1635,6 +1635,7 @@ popup.warning.nodeBanned=其中一个 {0} 节点已被禁用
popup.warning.priceRelay=价格传递
popup.warning.seed=种子
popup.warning.mandatoryUpdate.trading=请更新到最新的 Haveno 版本。强制更新禁止了旧版本进行交易。更多信息请访问 Haveno 论坛。
popup.warning.noFilter=我们没有从种子节点接收到过滤器对象。请通知网络管理员注册一个过滤器对象。
popup.warning.burnXMR=这笔交易是无法实现，因为 {0} 的挖矿手续费用会超过 {1} 的转账金额。请等到挖矿手续费再次降低或您积累了更多的 XMR 来转账。
popup.warning.openOffer.makerFeeTxRejected=交易 ID 为 {0} 的挂单费交易被比特币网络拒绝。\n交易 ID = {1}\n交易已被移至失败交易。\n请到“设置/网络信息”进行 SPV 重新同步。\n如需更多帮助，请联系 Haveno Keybase 团队的 Support 频道
@ -1998,6 +1999,10 @@ payment.revolut.info=Revolut 要求使用“用户名”作为帐户 ID，而不
payment.account.revolut.addUserNameInfo={0}\n您现有的 Revolut 帐户（{1}）尚未设置“用户名”。\n请输入您的 Revolut ``用户名''以更新您的帐户数据。\n这不会影响您的账龄验证状态。
payment.revolut.addUserNameInfo.headLine=更新 Revolut 账户
payment.cashapp.info=请注意，Cash App 的退款风险高于大多数银行转账。
payment.venmo.info=请注意，Venmo 的退款风险高于大多数银行转账。
payment.paypal.info=请注意，PayPal 的退款风险高于大多数银行转账。
payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

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

@ -1631,6 +1631,7 @@ popup.warning.nodeBanned=其中一個 {0} 節點已被禁用
popup.warning.priceRelay=價格傳遞
popup.warning.seed=種子
popup.warning.mandatoryUpdate.trading=請更新到最新的 Haveno 版本。強制更新禁止了舊版本進行交易。更多信息請訪問 Haveno 論壇。
popup.warning.noFilter=我們未從種子節點收到過濾器物件。請通知網路管理員註冊過濾器物件。
popup.warning.burnXMR=這筆交易是無法實現，因為 {0} 的挖礦手續費用會超過 {1} 的轉賬金額。請等到挖礦手續費再次降低或您積累了更多的 XMR 來轉賬。
popup.warning.openOffer.makerFeeTxRejected=交易 ID 為 {0} 的掛單費交易被比特幣網絡拒絕。\n交易 ID = {1}\n交易已被移至失敗交易。\n請到“設置/網絡信息”進行 SPV 重新同步。\n如需更多幫助，請聯繫 Haveno Keybase 團隊的 Support 頻道
@ -1992,6 +1993,10 @@ payment.revolut.info=Revolut 要求使用“用户名”作為帳户 ID，而不
payment.account.revolut.addUserNameInfo={0}\n您現有的 Revolut 帳户（{1}）尚未設置“用户名”。\n請輸入您的 Revolut ``用户名''以更新您的帳户數據。\n這不會影響您的賬齡驗證狀態。
payment.revolut.addUserNameInfo.headLine=更新 Revolut 賬户
payment.cashapp.info=請注意，Cash App 的退款風險高於大多數銀行轉帳。
payment.venmo.info=請注意，Venmo 的退款風險高於大多數銀行轉帳。
payment.paypal.info=請注意，PayPal 的退款風險高於大多數銀行轉帳。
payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account

388
desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java
View file

@ -788,11 +788,13 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
return new TableCell<>() {
@Override
public void updateItem(final OfferBookListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null && !empty)
setGraphic(new ColoredDecimalPlacesWithZerosText(model.getAmount(item), GUIUtil.AMOUNT_DECIMALS_WITH_ZEROS));
else
setGraphic(null);
UserThread.execute(() -> {
super.updateItem(item, empty);
if (item != null && !empty)
setGraphic(new ColoredDecimalPlacesWithZerosText(model.getAmount(item), GUIUtil.AMOUNT_DECIMALS_WITH_ZEROS));
else
setGraphic(null);
});
}
};
}
@ -817,12 +819,13 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
@Override
public void updateItem(final OfferBookListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null && !empty)
setText(CurrencyUtil.getCurrencyPair(item.getOffer().getCurrencyCode()));
else
setText("");
UserThread.execute(() -> {
super.updateItem(item, empty);
if (item != null && !empty)
setText(CurrencyUtil.getCurrencyPair(item.getOffer().getCurrencyCode()));
else
setText("");
});
}
};
}
@ -852,13 +855,15 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
return new TableCell<>() {
@Override
public void updateItem(final OfferBookListItem item, boolean empty) {
super.updateItem(item, empty);
UserThread.execute(() -> {
super.updateItem(item, empty);
if (item != null && !empty) {
setGraphic(getPriceAndPercentage(item));
} else {
setGraphic(null);
}
if (item != null && !empty) {
setGraphic(getPriceAndPercentage(item));
} else {
setGraphic(null);
}
});
}
private HBox getPriceAndPercentage(OfferBookListItem item) {
@ -934,21 +939,23 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
return new TableCell<>() {
@Override
public void updateItem(final OfferBookListItem item, boolean empty) {
super.updateItem(item, empty);
UserThread.execute(() -> {
super.updateItem(item, empty);
if (item != null && !empty) {
if (item.getOffer().getPrice() == null) {
setText(Res.get("shared.na"));
setGraphic(null);
if (item != null && !empty) {
if (item.getOffer().getPrice() == null) {
setText(Res.get("shared.na"));
setGraphic(null);
} else {
setText("");
setGraphic(new ColoredDecimalPlacesWithZerosText(model.getVolume(item),
model.getNumberOfDecimalsForVolume(item)));
}
} else {
setText("");
setGraphic(new ColoredDecimalPlacesWithZerosText(model.getVolume(item),
model.getNumberOfDecimalsForVolume(item)));
setGraphic(null);
}
} else {
setText("");
setGraphic(null);
}
});
}
};
}
@ -974,30 +981,32 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
@Override
public void updateItem(final OfferBookListItem item, boolean empty) {
super.updateItem(item, empty);
UserThread.execute(() -> {
super.updateItem(item, empty);
if (item != null && !empty) {
if (item != null && !empty) {
Offer offer = item.getOffer();
if (model.isOfferBanned(offer)) {
setGraphic(new AutoTooltipLabel(model.getPaymentMethod(item)));
} else {
if (offer.isXmrAutoConf()) {
field = new HyperlinkWithIcon(model.getPaymentMethod(item), AwesomeIcon.ROCKET);
Offer offer = item.getOffer();
if (model.isOfferBanned(offer)) {
setGraphic(new AutoTooltipLabel(model.getPaymentMethod(item)));
} else {
field = new HyperlinkWithIcon(model.getPaymentMethod(item));
if (offer.isXmrAutoConf()) {
field = new HyperlinkWithIcon(model.getPaymentMethod(item), AwesomeIcon.ROCKET);
} else {
field = new HyperlinkWithIcon(model.getPaymentMethod(item));
}
field.setOnAction(event -> {
offerDetailsWindow.show(offer);
});
field.setTooltip(new Tooltip(model.getPaymentMethodToolTip(item)));
setGraphic(field);
}
field.setOnAction(event -> {
offerDetailsWindow.show(offer);
});
field.setTooltip(new Tooltip(model.getPaymentMethodToolTip(item)));
setGraphic(field);
} else {
setGraphic(null);
if (field != null)
field.setOnAction(null);
}
} else {
setGraphic(null);
if (field != null)
field.setOnAction(null);
}
});
}
};
}
@ -1026,25 +1035,28 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
return new TableCell<>() {
@Override
public void updateItem(final OfferBookListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null && !empty) {
var isSellOffer = item.getOffer().getDirection() == OfferDirection.SELL;
var deposit = isSellOffer ? item.getOffer().getMaxBuyerSecurityDeposit() :
item.getOffer().getMaxSellerSecurityDeposit();
if (deposit == null) {
setText(Res.get("shared.na"));
setGraphic(null);
UserThread.execute(() -> {
super.updateItem(item, empty);
if (item != null && !empty) {
var isSellOffer = item.getOffer().getDirection() == OfferDirection.SELL;
var deposit = isSellOffer ? item.getOffer().getMaxBuyerSecurityDeposit() :
item.getOffer().getMaxSellerSecurityDeposit();
if (deposit == null) {
setText(Res.get("shared.na"));
setGraphic(null);
} else {
setText("");
String rangePrefix = item.getOffer().isRange() ? "<= " : "";
setGraphic(new ColoredDecimalPlacesWithZerosText(rangePrefix + model.formatDepositString(
deposit, item.getOffer().getAmount().longValueExact()),
GUIUtil.AMOUNT_DECIMALS_WITH_ZEROS));
}
} else {
setText("");
String rangePrefix = item.getOffer().isRange() ? "<= " : "";
setGraphic(new ColoredDecimalPlacesWithZerosText(rangePrefix + model.formatDepositString(
deposit, item.getOffer().getAmount().longValueExact()),
GUIUtil.AMOUNT_DECIMALS_WITH_ZEROS));
setGraphic(null);
}
} else {
setText("");
setGraphic(null);
}
});
}
};
}
@ -1071,112 +1083,114 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
@Override
public void updateItem(final OfferBookListItem item, boolean empty) {
super.updateItem(item, empty);
UserThread.execute(() -> {
super.updateItem(item, empty);
final ImageView iconView = new ImageView();
final AutoTooltipButton button = new AutoTooltipButton();
final ImageView iconView = new ImageView();
final AutoTooltipButton button = new AutoTooltipButton();
{
button.setGraphic(iconView);
button.setGraphicTextGap(10);
button.setPrefWidth(10000);
}
final ImageView iconView2 = new ImageView();
final AutoTooltipButton button2 = new AutoTooltipButton();
{
button2.setGraphic(iconView2);
button2.setGraphicTextGap(10);
button2.setPrefWidth(10000);
}
final HBox hbox = new HBox();
{
hbox.setSpacing(8);
hbox.setAlignment(Pos.CENTER);
hbox.getChildren().add(button);
hbox.getChildren().add(button2);
HBox.setHgrow(button, Priority.ALWAYS);
HBox.setHgrow(button2, Priority.ALWAYS);
}
TableRow<OfferBookListItem> tableRow = getTableRow();
if (item != null && !empty) {
Offer offer = item.getOffer();
boolean myOffer = model.isMyOffer(offer);
// https://github.com/bisq-network/bisq/issues/4986
if (tableRow != null) {
canTakeOfferResult = model.offerFilterService.canTakeOffer(offer, false);
tableRow.setOpacity(canTakeOfferResult.isValid() || myOffer ? 1 : 0.4);
if (myOffer) {
button.setDefaultButton(false);
tableRow.setOnMousePressed(null);
} else if (canTakeOfferResult.isValid()) {
// set first row button as default
button.setDefaultButton(getIndex() == 0);
tableRow.setOnMousePressed(null);
} else {
button.setDefaultButton(false);
tableRow.setOnMousePressed(e -> {
// ugly hack to get the icon clickable when deactivated
if (!(e.getTarget() instanceof ImageView || e.getTarget() instanceof Canvas))
onShowInfo(offer, canTakeOfferResult);
});
}
{
button.setGraphic(iconView);
button.setGraphicTextGap(10);
button.setPrefWidth(10000);
}
String title;
if (myOffer) {
iconView.setId("image-remove");
title = Res.get("shared.remove");
button.setOnAction(e -> onRemoveOpenOffer(offer));
final ImageView iconView2 = new ImageView();
final AutoTooltipButton button2 = new AutoTooltipButton();
iconView2.setId("image-edit");
button2.updateText(Res.get("shared.edit"));
button2.setOnAction(e -> onEditOpenOffer(offer));
button2.setManaged(true);
button2.setVisible(true);
} else {
boolean isSellOffer = OfferViewUtil.isShownAsSellOffer(offer);
boolean isPrivateOffer = offer.isPrivateOffer();
iconView.setId(isPrivateOffer ? "image-lock2x" : isSellOffer ? "image-buy-white" : "image-sell-white");
iconView.setFitHeight(16);
iconView.setFitWidth(16);
button.setId(isSellOffer ? "buy-button" : "sell-button");
button.setStyle("-fx-text-fill: white");
title = Res.get("offerbook.takeOffer");
button.setTooltip(new Tooltip(Res.get("offerbook.takeOfferButton.tooltip", model.getDirectionLabelTooltip(offer))));
button.setOnAction(e -> onTakeOffer(offer));
button2.setManaged(false);
button2.setVisible(false);
{
button2.setGraphic(iconView2);
button2.setGraphicTextGap(10);
button2.setPrefWidth(10000);
}
if (!myOffer) {
if (canTakeOfferResult == null) {
final HBox hbox = new HBox();
{
hbox.setSpacing(8);
hbox.setAlignment(Pos.CENTER);
hbox.getChildren().add(button);
hbox.getChildren().add(button2);
HBox.setHgrow(button, Priority.ALWAYS);
HBox.setHgrow(button2, Priority.ALWAYS);
}
TableRow<OfferBookListItem> tableRow = getTableRow();
if (item != null && !empty) {
Offer offer = item.getOffer();
boolean myOffer = model.isMyOffer(offer);
// https://github.com/bisq-network/bisq/issues/4986
if (tableRow != null) {
canTakeOfferResult = model.offerFilterService.canTakeOffer(offer, false);
tableRow.setOpacity(canTakeOfferResult.isValid() || myOffer ? 1 : 0.4);
if (myOffer) {
button.setDefaultButton(false);
tableRow.setOnMousePressed(null);
} else if (canTakeOfferResult.isValid()) {
// set first row button as default
button.setDefaultButton(getIndex() == 0);
tableRow.setOnMousePressed(null);
} else {
button.setDefaultButton(false);
tableRow.setOnMousePressed(e -> {
// ugly hack to get the icon clickable when deactivated
if (!(e.getTarget() instanceof ImageView || e.getTarget() instanceof Canvas))
onShowInfo(offer, canTakeOfferResult);
});
}
}
if (!canTakeOfferResult.isValid()) {
button.setOnAction(e -> onShowInfo(offer, canTakeOfferResult));
String title;
if (myOffer) {
iconView.setId("image-remove");
title = Res.get("shared.remove");
button.setOnAction(e -> onRemoveOpenOffer(offer));
iconView2.setId("image-edit");
button2.updateText(Res.get("shared.edit"));
button2.setOnAction(e -> onEditOpenOffer(offer));
button2.setManaged(true);
button2.setVisible(true);
} else {
boolean isSellOffer = OfferViewUtil.isShownAsSellOffer(offer);
boolean isPrivateOffer = offer.isPrivateOffer();
iconView.setId(isPrivateOffer ? "image-lock2x" : isSellOffer ? "image-buy-white" : "image-sell-white");
iconView.setFitHeight(16);
iconView.setFitWidth(16);
button.setId(isSellOffer ? "buy-button" : "sell-button");
button.setStyle("-fx-text-fill: white");
title = Res.get("offerbook.takeOffer");
button.setTooltip(new Tooltip(Res.get("offerbook.takeOfferButton.tooltip", model.getDirectionLabelTooltip(offer))));
button.setOnAction(e -> onTakeOffer(offer));
button2.setManaged(false);
button2.setVisible(false);
}
if (!myOffer) {
if (canTakeOfferResult == null) {
canTakeOfferResult = model.offerFilterService.canTakeOffer(offer, false);
}
if (!canTakeOfferResult.isValid()) {
button.setOnAction(e -> onShowInfo(offer, canTakeOfferResult));
}
}
button.updateText(title);
setPadding(new Insets(0, 15, 0, 0));
setGraphic(hbox);
} else {
setGraphic(null);
button.setOnAction(null);
button2.setOnAction(null);
if (tableRow != null) {
tableRow.setOpacity(1);
tableRow.setOnMousePressed(null);
}
}
button.updateText(title);
setPadding(new Insets(0, 15, 0, 0));
setGraphic(hbox);
} else {
setGraphic(null);
button.setOnAction(null);
button2.setOnAction(null);
if (tableRow != null) {
tableRow.setOpacity(1);
tableRow.setOnMousePressed(null);
}
}
});
}
};
}
@ -1204,17 +1218,19 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
return new TableCell<>() {
@Override
public void updateItem(final OfferBookListItem item, boolean empty) {
super.updateItem(item, empty);
UserThread.execute(() -> {
super.updateItem(item, empty);
if (item != null && !empty) {
var witnessAgeData = item.getWitnessAgeData(accountAgeWitnessService, signedWitnessService);
var label = witnessAgeData.isSigningRequired()
? new AccountStatusTooltipLabel(witnessAgeData)
: new InfoAutoTooltipLabel(witnessAgeData.getDisplayString(), witnessAgeData.getIcon(), ContentDisplay.RIGHT, witnessAgeData.getInfo());
setGraphic(label);
} else {
setGraphic(null);
}
if (item != null && !empty) {
var witnessAgeData = item.getWitnessAgeData(accountAgeWitnessService, signedWitnessService);
var label = witnessAgeData.isSigningRequired()
? new AccountStatusTooltipLabel(witnessAgeData)
: new InfoAutoTooltipLabel(witnessAgeData.getDisplayString(), witnessAgeData.getIcon(), ContentDisplay.RIGHT, witnessAgeData.getInfo());
setGraphic(label);
} else {
setGraphic(null);
}
});
}
};
}
@ -1240,24 +1256,26 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
return new TableCell<>() {
@Override
public void updateItem(final OfferBookListItem newItem, boolean empty) {
super.updateItem(newItem, empty);
if (newItem != null && !empty) {
final Offer offer = newItem.getOffer();
final NodeAddress makersNodeAddress = offer.getOwnerNodeAddress();
String role = Res.get("peerInfoIcon.tooltip.maker");
int numTrades = model.getNumTrades(offer);
PeerInfoIconTrading peerInfoIcon = new PeerInfoIconTrading(makersNodeAddress,
role,
numTrades,
privateNotificationManager,
offer,
model.preferences,
model.accountAgeWitnessService,
useDevPrivilegeKeys);
setGraphic(peerInfoIcon);
} else {
setGraphic(null);
}
UserThread.execute(() -> {
super.updateItem(newItem, empty);
if (newItem != null && !empty) {
final Offer offer = newItem.getOffer();
final NodeAddress makersNodeAddress = offer.getOwnerNodeAddress();
String role = Res.get("peerInfoIcon.tooltip.maker");
int numTrades = model.getNumTrades(offer);
PeerInfoIconTrading peerInfoIcon = new PeerInfoIconTrading(makersNodeAddress,
role,
numTrades,
privateNotificationManager,
offer,
model.preferences,
model.accountAgeWitnessService,
useDevPrivilegeKeys);
setGraphic(peerInfoIcon);
} else {
setGraphic(null);
}
});
}
};
}

56
desktop/src/main/java/haveno/desktop/main/portfolio/failedtrades/FailedTradesView.java
View file

@ -27,6 +27,7 @@ import haveno.core.offer.Offer;
import haveno.core.trade.Contract;
import haveno.core.trade.HavenoUtils;
import haveno.core.trade.Trade;
import haveno.core.user.User;
import haveno.core.xmr.wallet.XmrWalletService;
import haveno.desktop.common.view.ActivatableViewAndModel;
import haveno.desktop.common.view.FxmlView;
@ -98,15 +99,18 @@ public class FailedTradesView extends ActivatableViewAndModel<VBox, FailedTrades
private ChangeListener<String> filterTextFieldListener;
private Scene scene;
private XmrWalletService xmrWalletService;
private User user;
private ContextMenu contextMenu;
@Inject
public FailedTradesView(FailedTradesViewModel model,
TradeDetailsWindow tradeDetailsWindow,
XmrWalletService xmrWalletService) {
XmrWalletService xmrWalletService,
User user) {
super(model);
this.tradeDetailsWindow = tradeDetailsWindow;
this.xmrWalletService = xmrWalletService;
this.user = user;
}
@Override
@ -190,9 +194,33 @@ public class FailedTradesView extends ActivatableViewAndModel<VBox, FailedTrades
tableView.setItems(sortedList);
contextMenu = new ContextMenu();
MenuItem item1 = new MenuItem(Res.get("support.contextmenu.penalize.msg", Res.get("shared.maker")));
MenuItem item2 = new MenuItem(Res.get("support.contextmenu.penalize.msg", Res.get("shared.taker")));
contextMenu.getItems().addAll(item1, item2);
boolean isArbitrator = user.getRegisteredArbitrator() != null;
if (isArbitrator) {
MenuItem item1 = new MenuItem(Res.get("support.contextmenu.penalize.msg", Res.get("shared.maker")));
MenuItem item2 = new MenuItem(Res.get("support.contextmenu.penalize.msg", Res.get("shared.taker")));
item1.setOnAction(event -> {
Trade selectedFailedTrade = tableView.getSelectionModel().getSelectedItem().getTrade();
handleContextMenu("portfolio.failed.penalty.msg",
Res.get(selectedFailedTrade.getMaker() == selectedFailedTrade.getBuyer() ? "shared.buyer" : "shared.seller"),
Res.get("shared.maker"),
selectedFailedTrade.getMaker().getSecurityDeposit(),
selectedFailedTrade.getMaker().getReserveTxHash(),
selectedFailedTrade.getMaker().getReserveTxHex());
});
item2.setOnAction(event -> {
Trade selectedFailedTrade = tableView.getSelectionModel().getSelectedItem().getTrade();
handleContextMenu("portfolio.failed.penalty.msg",
Res.get(selectedFailedTrade.getTaker() == selectedFailedTrade.getBuyer() ? "shared.buyer" : "shared.seller"),
Res.get("shared.taker"),
selectedFailedTrade.getTaker().getSecurityDeposit(),
selectedFailedTrade.getTaker().getReserveTxHash(),
selectedFailedTrade.getTaker().getReserveTxHex());
});
contextMenu.getItems().addAll(item1, item2);
}
tableView.setRowFactory(tv -> {
TableRow<FailedTradesListItem> row = new TableRow<>();
@ -202,26 +230,6 @@ public class FailedTradesView extends ActivatableViewAndModel<VBox, FailedTrades
return row;
});
item1.setOnAction(event -> {
Trade selectedFailedTrade = tableView.getSelectionModel().getSelectedItem().getTrade();
handleContextMenu("portfolio.failed.penalty.msg",
Res.get(selectedFailedTrade.getMaker() == selectedFailedTrade.getBuyer() ? "shared.buyer" : "shared.seller"),
Res.get("shared.maker"),
selectedFailedTrade.getMaker().getSecurityDeposit(),
selectedFailedTrade.getMaker().getReserveTxHash(),
selectedFailedTrade.getMaker().getReserveTxHex());
});
item2.setOnAction(event -> {
Trade selectedFailedTrade = tableView.getSelectionModel().getSelectedItem().getTrade();
handleContextMenu("portfolio.failed.penalty.msg",
Res.get(selectedFailedTrade.getTaker() == selectedFailedTrade.getBuyer() ? "shared.buyer" : "shared.seller"),
Res.get("shared.taker"),
selectedFailedTrade.getTaker().getSecurityDeposit(),
selectedFailedTrade.getTaker().getReserveTxHash(),
selectedFailedTrade.getTaker().getReserveTxHex());
});
numItems.setText(Res.get("shared.numItemsLabel", sortedList.size()));
exportButton.setOnAction(event -> {
ObservableList<TableColumn<FailedTradesListItem, ?>> tableColumns = tableView.getColumns();