-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
Show a confirmation of successfully sending BTC or BSQ from wallet #5071
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be great to get rid of the error message on the empty fields after the successful transfer as well.
For the
BsqSendView
this would mean changing in theshowPublishTxPopup
resultHandler intoThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not beautiful, but it works 😉
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @ripcurlx, implemented your suggestions. 👍