Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update bond lockup prompt #2487

Merged
merged 1 commit into from
Mar 2, 2019
Merged

Update bond lockup prompt #2487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1411,9 +1411,9 @@ dao.bond.reputation.salt=Salt
dao.bond.reputation.hash=Hash
dao.bond.reputation.lockupButton=Lockup
dao.bond.reputation.lockup.headline=Confirm lockup transaction
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.headline=Confirm unlock transaction
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?

dao.bond.allBonds.header=All bonds

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
dao.bond.reputation.hash=Hash
dao.bond.reputation.lockupButton=Sperren
dao.bond.reputation.lockup.headline=Sperrung-Transaktion bestätigen
dao.bond.reputation.lockup.details=Gesperrter Betrag: {0}\nSperr Zeit: {1} Blöcke(Block)\n\nSind Sie sicher, dass Sie fortfahren möchten?
dao.bond.reputation.lockup.details=Gesperrter Betrag: {0}\nSperr Zeit: {1} Blöcke(Block) (≈{2})\n\nSind Sie sicher, dass Sie fortfahren möchten?
dao.bond.reputation.unlock.headline=Entsperrung-Transaktion bestätigen
dao.bond.reputation.unlock.details=Entsperrter Betrag: {0}\nSperr Zeit: {1} Blöcke(Block)\n\nSind Sie sicher, dass Sie fortfahren möchten?
dao.bond.reputation.unlock.details=Entsperrter Betrag: {0}\nSperr Zeit: {1} Blöcke(Block) (≈{2})\n\nSind Sie sicher, dass Sie fortfahren möchten?

dao.bond.allBonds.header=Alle Pfänder

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_el.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
dao.bond.reputation.hash=Hash
dao.bond.reputation.lockupButton=Lockup
dao.bond.reputation.lockup.headline=Confirm lockup transaction
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.headline=Confirm unlock transaction
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?

dao.bond.allBonds.header=All bonds

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_es.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
dao.bond.reputation.hash=Hash
dao.bond.reputation.lockupButton=Bloquear
dao.bond.reputation.lockup.headline=Confirmar transacción de bloqueo
dao.bond.reputation.lockup.details=Cantidad bloqueada: {0}\nTiempo de bloqueo: {1} bloque(s)\n\nEstá seguro de que quiere proceder?
dao.bond.reputation.lockup.details=Cantidad bloqueada: {0}\nTiempo de bloqueo: {1} bloque(s) (≈{2})\n\nEstá seguro de que quiere proceder?
dao.bond.reputation.unlock.headline=Confirmar desbloqueo de transacción
dao.bond.reputation.unlock.details=Cantidad a desbloquear: {0}\nTiempo de bloqueo: {1} bloque(s)\n\nEstá seguro de que quiere proceder?
dao.bond.reputation.unlock.details=Cantidad a desbloquear: {0}\nTiempo de bloqueo: {1} bloque(s) (≈{2})\n\nEstá seguro de que quiere proceder?

dao.bond.allBonds.header=Todos los bonos

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_fa.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=داده تصادفی
dao.bond.reputation.hash=تابع درهم ساز (هش)
dao.bond.reputation.lockupButton=قفل کردن
dao.bond.reputation.lockup.headline=تایید تراکنش قفل کردن وجه
dao.bond.reputation.lockup.details=مقدار وجه قفل شده: {0}\nمدت زمان قفل ماندن: ({1}) بلاک\n\nآیا از ادامه دادن مطمئنید؟
dao.bond.reputation.lockup.details=مقدار وجه قفل شده: {0}\nمدت زمان قفل ماندن: ({1}) بلاک (≈{2})\n\nآیا از ادامه دادن مطمئنید؟
dao.bond.reputation.unlock.headline=تایید تراکنش رها کردن وجه
dao.bond.reputation.unlock.details=مقدار رها شدن وجه: {0}\nمدت زمان قفل شدن: ({1}) بلاک\n\nآیا از ادامه دادن مطمئنید؟
dao.bond.reputation.unlock.details=مقدار رها شدن وجه: {0}\nمدت زمان قفل شدن: ({1}) بلاک (≈{2})\n\nآیا از ادامه دادن مطمئنید؟

dao.bond.allBonds.header=همه ضمانت‌ها

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
dao.bond.reputation.hash=Hash
dao.bond.reputation.lockupButton=Lockup
dao.bond.reputation.lockup.headline=Confirm lockup transaction
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.headline=Confirm unlock transaction
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?

dao.bond.allBonds.header=All bonds

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_hu.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
dao.bond.reputation.hash=Hash
dao.bond.reputation.lockupButton=Lockup
dao.bond.reputation.lockup.headline=Confirm lockup transaction
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.headline=Confirm unlock transaction
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?

dao.bond.allBonds.header=All bonds

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_pt.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Sal
dao.bond.reputation.hash=Hash
dao.bond.reputation.lockupButton=Travar
dao.bond.reputation.lockup.headline=Confirm lockup transaction
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.headline=Confirm unlock transaction
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?

dao.bond.allBonds.header=All bonds

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_ro.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
dao.bond.reputation.hash=Hash
dao.bond.reputation.lockupButton=Lockup
dao.bond.reputation.lockup.headline=Confirm lockup transaction
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.headline=Confirm unlock transaction
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?

dao.bond.allBonds.header=All bonds

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_ru.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Соль
dao.bond.reputation.hash=Хеш
dao.bond.reputation.lockupButton=Запереть
dao.bond.reputation.lockup.headline=Подтвердить транзакцию блокировки
dao.bond.reputation.lockup.details=Запереть сумму: {0}\nВремя блокировки: {1} блок(ов) \n\nДействительно желаете продолжить?
dao.bond.reputation.lockup.details=Запереть сумму: {0}\nВремя блокировки: {1} блок(ов) (≈{2})\n\nДействительно желаете продолжить?
dao.bond.reputation.unlock.headline=Подтвердить транзакцию разблокировки
dao.bond.reputation.unlock.details=Отпереть сумму: {0}\nВремя блокировки: {1} блок(ов)\n\nДействительно желаете продолжить?
dao.bond.reputation.unlock.details=Отпереть сумму: {0}\nВремя блокировки: {1} блок(ов) (≈{2})\n\nДействительно желаете продолжить?

dao.bond.allBonds.header=Все гарантийные депозиты

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_sr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
dao.bond.reputation.hash=Hash
dao.bond.reputation.lockupButton=Lockup
dao.bond.reputation.lockup.headline=Confirm lockup transaction
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.headline=Confirm unlock transaction
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?

dao.bond.allBonds.header=All bonds

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_th.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=ข้อมูลแบบสุ่ม
dao.bond.reputation.hash=Hash
dao.bond.reputation.lockupButton=ล็อค
dao.bond.reputation.lockup.headline=ยืนยันล็อคการทำรายการ
dao.bond.reputation.lockup.details=ล็อคจำนวน: {0}\nล็อคเวลา: {1} บล็อก\n\nคุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?
dao.bond.reputation.lockup.details=ล็อคจำนวน: {0}\nล็อคเวลา: {1} บล็อก (≈{2})\n\nคุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?
dao.bond.reputation.unlock.headline=ยืนยันการปลดล็อกธุรกรรม
dao.bond.reputation.unlock.details=จำนวนที่ปลดล็อค: {0}\nเวลาในการล็อค: {1} บล็อก (s)\n\nคุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ
dao.bond.reputation.unlock.details=จำนวนที่ปลดล็อค: {0}\nเวลาในการล็อค: {1} บล็อก (s) (≈{2})\n\nคุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ

dao.bond.allBonds.header=การค้ำประกันทั้งหมด

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_vi.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
dao.bond.reputation.hash=Hash
dao.bond.reputation.lockupButton=Khóa
dao.bond.reputation.lockup.headline=Xác nhận giao dịch khóa
dao.bond.reputation.lockup.details=Số lượng khóa: {0}\nThời gian khóa: {1} khối\n\nBạn có thực sự muốn tiếp tục?
dao.bond.reputation.lockup.details=Số lượng khóa: {0}\nThời gian khóa: {1} khối (≈{2})\n\nBạn có thực sự muốn tiếp tục?
dao.bond.reputation.unlock.headline=Xác nhận giao dịch mở khóa
dao.bond.reputation.unlock.details=Số lượng mở khóa: {0}\nThời gian mở khóa: {1} khối\n\nBạn có thực sự muốn tiếp tục?
dao.bond.reputation.unlock.details=Số lượng mở khóa: {0}\nThời gian mở khóa: {1} khối (≈{2})\n\nBạn có thực sự muốn tiếp tục?

dao.bond.allBonds.header=Tất cả cách tài sản đảm bảo

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/i18n/displayStrings_zh.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,9 +1227,9 @@ dao.bond.reputation.salt=Salt
dao.bond.reputation.hash=Hash
dao.bond.reputation.lockupButton=Lockup
dao.bond.reputation.lockup.headline=Confirm lockup transaction
dao.bond.reputation.lockup.details=Lockup amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.lockup.details=Lockup amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.headline=Confirm unlock transaction
dao.bond.reputation.unlock.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bond.reputation.unlock.details=Unlock amount: {0}\nUnlock time: {1} block(s) (≈{2})\n\nAre you sure you want to proceed?

dao.bond.allBonds.header=All bonds

Expand Down
11 changes: 9 additions & 2 deletions desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingViewUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import bisq.core.dao.state.model.governance.BondedRoleType;
import bisq.core.dao.state.model.governance.Role;
import bisq.core.locale.Res;
import bisq.core.util.BSFormatter;
import bisq.core.util.BsqFormatter;

import bisq.network.p2p.P2PService;
Expand Down Expand Up @@ -100,10 +101,13 @@ private void lockupBond(byte[] hash, Coin lockupAmount, int lockupTime, LockupRe
Consumer<String> resultHandler) {
if (GUIUtil.isReadyForTxBroadcast(p2PService, walletsSetup)) {
if (!DevEnv.isDevMode()) {
BSFormatter formatter = new BSFormatter();
String duration = formatter.formatDurationAsWords(lockupTime * 10 * 60 * 1000L, false, false);
new Popup<>().headLine(Res.get("dao.bond.reputation.lockup.headline"))
.confirmation(Res.get("dao.bond.reputation.lockup.details",
bsqFormatter.formatCoinWithCode(lockupAmount),
lockupTime
lockupTime,
duration
))
.actionButtonText(Res.get("shared.yes"))
.onAction(() -> publishLockupTx(hash, lockupAmount, lockupTime, lockupReason, resultHandler))
Expand Down Expand Up @@ -143,10 +147,13 @@ public void unLock(String lockupTxId, Consumer<String> resultHandler) {

try {
if (!DevEnv.isDevMode()) {
BSFormatter formatter = new BSFormatter();
String duration = formatter.formatDurationAsWords(lockTime * 10 * 60 * 1000L, false, false);
new Popup<>().headLine(Res.get("dao.bond.reputation.unlock.headline"))
.confirmation(Res.get("dao.bond.reputation.unlock.details",
bsqFormatter.formatCoinWithCode(unlockAmount),
lockTime
lockTime,
duration
))
.actionButtonText(Res.get("shared.yes"))
.onAction(() -> publishUnlockTx(lockupTxId, resultHandler))
Expand Down