-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5071 from jmacxx/fix_issue_5067
Show a confirmation of successfully sending BTC or BSQ from wallet
- Loading branch information
Showing
5 changed files
with
128 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
desktop/src/main/java/bisq/desktop/main/overlays/windows/TxDetails.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * This file is part of Bisq. | ||
| * | ||
| * Bisq is free software: you can redistribute it and/or modify it | ||
| * under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * Bisq is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public | ||
| * License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with Bisq. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package bisq.desktop.main.overlays.windows; | ||
|
|
||
| import bisq.desktop.components.TxIdTextField; | ||
| import bisq.desktop.main.overlays.Overlay; | ||
|
|
||
| import bisq.core.locale.Res; | ||
|
|
||
| import javafx.scene.layout.GridPane; | ||
| import javafx.scene.layout.Region; | ||
|
|
||
| import static bisq.desktop.util.FormBuilder.*; | ||
|
|
||
| public class TxDetails extends Overlay<TxDetails> { | ||
|
|
||
| protected String txId, address, amount, note; | ||
| protected TxIdTextField txIdTextField; | ||
|
|
||
| public TxDetails(String txId, String address, String amount) { | ||
| type = Type.Attention; | ||
| this.txId = txId; | ||
| this.address = address; | ||
| this.amount = amount; | ||
| this.note = Res.get("txDetailsWindow.btc.note"); | ||
| } | ||
|
|
||
| public void show() { | ||
| rowIndex = -1; | ||
| width = 918; | ||
| if (headLine == null) | ||
| headLine = Res.get("txDetailsWindow.headline"); | ||
| createGridPane(); | ||
| gridPane.setHgap(15); | ||
| addHeadLine(); | ||
| addContent(); | ||
| addButtons(); | ||
| addDontShowAgainCheckBox(); | ||
| applyStyles(); | ||
| display(); | ||
| } | ||
|
|
||
| protected void addContent() { | ||
| GridPane.setColumnSpan( | ||
| addMultilineLabel(gridPane, ++rowIndex, note, 0), 2); | ||
| Region spacer = new Region(); | ||
| spacer.setMinHeight(20); | ||
| gridPane.add(spacer, 0, ++rowIndex); | ||
| addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.amount"), amount); | ||
| addConfirmationLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("txDetailsWindow.sentTo"), address); | ||
| txIdTextField = addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("txDetailsWindow.txId"), txId).second; | ||
| } | ||
| } |
33 changes: 33 additions & 0 deletions
33
desktop/src/main/java/bisq/desktop/main/overlays/windows/TxDetailsBsq.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * This file is part of Bisq. | ||
| * | ||
| * Bisq is free software: you can redistribute it and/or modify it | ||
| * under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * Bisq is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public | ||
| * License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with Bisq. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package bisq.desktop.main.overlays.windows; | ||
|
|
||
| import bisq.core.locale.Res; | ||
|
|
||
| public class TxDetailsBsq extends TxDetails { | ||
|
|
||
| public TxDetailsBsq(String txId, String address, String amount) { | ||
| super(txId, address, amount); | ||
| note = Res.get("txDetailsWindow.bsq.note"); | ||
| } | ||
|
|
||
| protected void addContent() { | ||
| super.addContent(); | ||
| txIdTextField.setBsq(true); | ||
| } | ||
| } |