<p><b>@ripcurlx</b> requested changes on this pull request.</p>
<p>NACK</p>
<p>Please see my comments and also please rebase against master to make it easier to review. Thanks!</p><hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/3785#discussion_r384431427">desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java</a>:</p>
<pre style='color:#555'>> + makerMiningFeeColumn.setComparator(new Comparator<ClosedTradableListItem>() {
+ @Override
+ public int compare(ClosedTradableListItem o1, ClosedTradableListItem o2) {
+ return model.getMakerMiningFee(o1).compareTo(model.getMakerMiningFee(o2));
+ }
+ });
</pre>
<p>This can be done within one line</p>
<pre><code>makerMiningFeeColumn.setComparator(Comparator.comparing(model::getMakerMiningFee));
</code></pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/3785#discussion_r384431616">desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java</a>:</p>
<pre style='color:#555'>> + takerMiningFeeColumn.setComparator(new Comparator<ClosedTradableListItem>() {
+ @Override
+ public int compare(ClosedTradableListItem o1, ClosedTradableListItem o2) {
+ return model.getTakerMiningFee(o1).compareTo(model.getTakerMiningFee(o2));
+ }
+ });
</pre>
<p>This can be done within one line</p>
<pre><code>takerMiningFeeColumn.setComparator(Comparator.comparing(model::getTakerMiningFee));
</code></pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/3785#discussion_r384431841">desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java</a>:</p>
<pre style='color:#555'>> + makerTradingFeeColumn.setComparator(new Comparator<ClosedTradableListItem>() {
+ @Override
+ public int compare(ClosedTradableListItem o1, ClosedTradableListItem o2) {
+ return model.getMakerTradingFee(o1).compareTo(model.getMakerTradingFee(o2));
+ }
+ });
</pre>
<p>This can be done within one line</p>
<pre><code>makerTradingFeeColumn.setComparator(Comparator.comparing(model::getMakerTradingFee));
</code></pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/3785#discussion_r384432113">desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java</a>:</p>
<pre style='color:#555'>> + takerTradingFeeColumn.setComparator(new Comparator<ClosedTradableListItem>() {
+ @Override
+ public int compare(ClosedTradableListItem o1, ClosedTradableListItem o2) {
+ return model.getTakerTradingFee(o1).compareTo(model.getTakerTradingFee(o2));
+ }
+ });
</pre>
<p>This can be done within one line</p>
<pre><code>takerTradingFeeColumn.setComparator(Comparator.comparing(model::getTakerTradingFee));
</code></pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/3785#discussion_r384432810">desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesViewModel.java</a>:</p>
<pre style='color:#555'>> + String isBuyerMakerAndSellerTaker(ClosedTradableListItem item) {
+ if (item == null)
+ return "";
+ Tradable tradable = item.getTradable();
+ boolean flag = false;
+ if (tradable.getOffer() != null) {
+ flag = tradable.getOffer().isMyOffer(keyRing);
+ return flag ? Res.get("shared.maker", tradable.getOffer().getCurrencyCode()) : Res.get("shared.taker", tradable.getOffer().getCurrencyCode());
+ } else {
+ return "";
+ }
+ }
+
</pre>
<p>This method is never used.</p>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/3785#discussion_r384433452">desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesViewModel.java</a>:</p>
<pre style='color:#555'>> super(dataModel);
this.accountAgeWitnessService = accountAgeWitnessService;
this.formatter = formatter;
+ this.keyRing = keyRing;
</pre>
<p>Is never used</p>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/bisq-network/bisq/pull/3785?email_source=notifications&email_token=AJFFTNUGZE4KCUPAMQE52P3REZHAVA5CNFSM4J2GDL6KYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCW7LHTA#pullrequestreview-364819404">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNT57BKKHIMA76FKNC3REZHAVANCNFSM4J2GDL6A">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNQ6GCCOX245CRLYU33REZHAVA5CNFSM4J2GDL6KYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCW7LHTA.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/3785?email_source=notifications\u0026email_token=AJFFTNUGZE4KCUPAMQE52P3REZHAVA5CNFSM4J2GDL6KYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCW7LHTA#pullrequestreview-364819404",
"url": "https://github.com/bisq-network/bisq/pull/3785?email_source=notifications\u0026email_token=AJFFTNUGZE4KCUPAMQE52P3REZHAVA5CNFSM4J2GDL6KYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCW7LHTA#pullrequestreview-364819404",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>