<p>Now the recap of the trade displays also the fiat equivalent for Total Amount & Security Deposit for both makers and sellers.</p>
<p>Fix also the Total Amount displayed as a taker of a Sell btc trade when using bsq as trading fees (Bsq was not displayed in Total Amount).</p>
<p><strong>Maker, btc trading fee, previously</strong><br>
<a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/79100296/116713854-791cf080-a9d5-11eb-8ea6-d6b8c6d97bae.png"><img width="452" alt="maker_btc_old" src="https://user-images.githubusercontent.com/79100296/116713854-791cf080-a9d5-11eb-8ea6-d6b8c6d97bae.png" style="max-width:100%;"></a></p>
<p><strong>Maker, btc trading fee, now</strong><br>
<a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/79100296/116720169-2d217a00-a9dc-11eb-8d1d-f827f4a51bde.png"><img width="449" alt="maker_btc_new" src="https://user-images.githubusercontent.com/79100296/116720169-2d217a00-a9dc-11eb-8d1d-f827f4a51bde.png" style="max-width:100%;"></a></p>
<p><strong>Taker, btc trading fee, previously</strong><br>
<a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/79100296/116725147-dcad1b00-a9e1-11eb-9764-2d879a7829ac.png"><img width="458" alt="taker_btc_old" src="https://user-images.githubusercontent.com/79100296/116725147-dcad1b00-a9e1-11eb-9764-2d879a7829ac.png" style="max-width:100%;"></a></p>
<p><strong>Taker, btc trading fee, now</strong><br>
<a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/79100296/116720192-314d9780-a9dc-11eb-9ca7-0a288800464d.png"><img width="457" alt="taker_btc_new" src="https://user-images.githubusercontent.com/79100296/116720192-314d9780-a9dc-11eb-9ca7-0a288800464d.png" style="max-width:100%;"></a></p>
<p><strong>Maker, bsq trading fee, previously</strong><br>
<a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/79100296/116713988-9356ce80-a9d5-11eb-8612-99099138f6d7.png"><img width="444" alt="maker_bsq_old" src="https://user-images.githubusercontent.com/79100296/116713988-9356ce80-a9d5-11eb-8612-99099138f6d7.png" style="max-width:100%;"></a></p>
<p><strong>Maker, bsq trading fee, now</strong><br>
<a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/79100296/116720208-36124b80-a9dc-11eb-90df-cc7fd08c74b8.png"><img width="446" alt="maker_bsq_new" src="https://user-images.githubusercontent.com/79100296/116720208-36124b80-a9dc-11eb-90df-cc7fd08c74b8.png" style="max-width:100%;"></a></p>
<p><strong>Taker, bsq trading fee, previously</strong> -> THIS IS INCORRECT AS BSQ TRADING FEES ARE NOT DISPLAYED IN TOTAL AMOUNT<br>
<a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/79100296/116723438-d61da400-a9df-11eb-9990-5b3a8f92d2cb.png"><img width="447" alt="taker_bsq_old" src="https://user-images.githubusercontent.com/79100296/116723438-d61da400-a9df-11eb-9990-5b3a8f92d2cb.png" style="max-width:100%;"></a></p>
<p><strong>Taker, bsq trading fee, now</strong><br>
<a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/79100296/116720222-3a3e6900-a9dc-11eb-832f-6d8048d92577.png"><img width="448" alt="taker_bsq_new" src="https://user-images.githubusercontent.com/79100296/116720222-3a3e6900-a9dc-11eb-832f-6d8048d92577.png" style="max-width:100%;"></a></p>
<p>When security deposit is not the minimum for example, this is how it looks like:</p>
<p><a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/79100296/116721525-aff70480-a9dd-11eb-89c1-4bcd8bc20668.png"><img width="448" alt="percentage" src="https://user-images.githubusercontent.com/79100296/116721525-aff70480-a9dd-11eb-89c1-4bcd8bc20668.png" style="max-width:100%;"></a></p>
<hr>
<h4>You can view, comment on, or merge this pull request online at:</h4>
<p> <a href='https://github.com/bisq-network/bisq/pull/5452'>https://github.com/bisq-network/bisq/pull/5452</a></p>
<h4>Commit Summary</h4>
<ul>
<li>Add fiat equivalent for Total Amount & Security Deposit for both makers and sellers</li>
<li>Restore totalToPay as 'final' as before</li>
<li>Notice when the security deposit is the minimum possible</li>
<li>Add fiat conversion also for trade amount when making a trade to sell btc</li>
</ul>
<h4>File Changes</h4>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5452/files#diff-6be5a2a3e9efad426d4520445826d641b9e78a901f8120af6c528cced19a0587">desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java</a>
(33)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5452/files#diff-59d7f22981909d111b6a51bb9b2a827534b61b1807c9c2fa99c4bcc7ac032960">desktop/src/main/java/bisq/desktop/main/offer/OfferDataModel.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5452/files#diff-464b973414368d42f102b402b31160515781076ccee9f6fcd7f940b1929b9c81">desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5452/files#diff-574ce6bfa753de6de705ba360ded021a7a94dcc406ad740c009483f3a2effae7">desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java</a>
(33)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/bisq-network/bisq/pull/5452.patch'>https://github.com/bisq-network/bisq/pull/5452.patch</a></li>
<li><a href='https://github.com/bisq-network/bisq/pull/5452.diff'>https://github.com/bisq-network/bisq/pull/5452.diff</a></li>
</ul>
<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/5452">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNQPCKL34OL23A4OR43TLLLXPANCNFSM434VMYRA">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNT66QEGFTXUYK6UA73TLLLXPA5CNFSM434VMYRKYY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4NAGK6JA.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/5452",
"url": "https://github.com/bisq-network/bisq/pull/5452",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>