<p><strong>This PR implements <a class="user-mention" data-hovercard-type="user" data-hovercard-url="/users/m52go/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/m52go">@m52go</a>'s suggested simplification.</strong></p>
<blockquote>
<p>^ there is a lot of text on this screen...this reduces the chance that the user reads any of it.<br>
I'm not sure the parts on multiple confirmations, bank details, copy/paste, etc. are that important.<br>
Suggestion to simplify:</p>
</blockquote>
<pre><code>Your trade has reached at least 1 blockchain confirmation.
Please pay 303 EUR via the specified payment method to the BTC seller. You'll find the seller's account details on the next screen.
Important: when making the payment, leave the "reason for payment" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'.
If your bank charges you any fees to make the transfer, you are responsible for paying those fees.
</code></pre>
<p><a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="785643882" data-permission-text="Title is private" data-url="https://github.com/bisq-network/bisq/issues/5080" data-hovercard-type="pull_request" data-hovercard-url="/bisq-network/bisq/pull/5080/hovercard?comment_id=759932866&comment_type=issue_comment" href="https://github.com/bisq-network/bisq/pull/5080#issuecomment-759932866">#5080 (comment)</a></p>
<p>And</p>
<blockquote>
<p>I agree, but I would prefer to keep that for another PR. There are more popup text to improve but as the text is composed of several blocks depending on payment method its also not that trivial and need then better testing with the diff. payment methods.<br>
Any dev who wants to pick that up?</p>
</blockquote>
<p><a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="785643882" data-permission-text="Title is private" data-url="https://github.com/bisq-network/bisq/issues/5080" data-hovercard-type="pull_request" data-hovercard-url="/bisq-network/bisq/pull/5080/hovercard?comment_id=759939397&comment_type=issue_comment" href="https://github.com/bisq-network/bisq/pull/5080#issuecomment-759939397">#5080 (comment)</a></p>
<hr>
<p>Here is a set of screenshots showing how each popup looks: <a href="https://github.com/bisq-network/bisq/files/5832703/trade_popups.pdf">trade_popups.pdf</a>. It includes FasterPayments, Cash Desposit, Moneygram, HalCash, Altcoins, F2F, Zelle, Transferwise, Amazon, USPSMO, Sepa.</p>
<p>Here's one example:<br>
<a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/47253594/104970090-f769ff80-59af-11eb-9abd-b7a1e1a211bd.png"><img src="https://user-images.githubusercontent.com/47253594/104970090-f769ff80-59af-11eb-9abd-b7a1e1a211bd.png" alt="image" style="max-width:100%;"></a></p>
<hr>
<p><em>Please note I had to implement on PR <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="785643882" data-permission-text="Title is private" data-url="https://github.com/bisq-network/bisq/issues/5080" data-hovercard-type="pull_request" data-hovercard-url="/bisq-network/bisq/pull/5080/hovercard" href="https://github.com/bisq-network/bisq/pull/5080">#5080</a>, so those commits are also included here. I presume <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="785643882" data-permission-text="Title is private" data-url="https://github.com/bisq-network/bisq/issues/5080" data-hovercard-type="pull_request" data-hovercard-url="/bisq-network/bisq/pull/5080/hovercard" href="https://github.com/bisq-network/bisq/pull/5080">#5080</a> will be merged prior to this. Hopefully git will handle things intelligently.</em></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/5091'>https://github.com/bisq-network/bisq/pull/5091</a></p>
<h4>Commit Summary</h4>
<ul>
<li>Remove instructions for using trade id as reason for payment</li>
<li>Add popup at startup to notify about rule change if user had already a fiat account</li>
<li>Improve text, reformat tac text</li>
<li>Update core/src/main/resources/i18n/displayStrings.properties</li>
<li>Update core/src/main/resources/i18n/displayStrings.properties</li>
<li>Update desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java</li>
<li>Reword trade started popups per @m52go suggestion</li>
</ul>
<h4>File Changes</h4>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5091/files#diff-a6cc570e0f56a36136791beae8f497706216230467708be9343344cd953e5f08">core/src/main/resources/i18n/displayStrings.properties</a>
(25)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5091/files#diff-511e174da2e97e23280d0c420c9b970cae37569683accd5dcb00d45bd7b8fba9">desktop/src/main/java/bisq/desktop/main/MainViewModel.java</a>
(21)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5091/files#diff-6ee44314b3bacad7509faea77c2f7850449f2e1ff995c1f3561fc36debfacef3">desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java</a>
(14)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5091/files#diff-6b3e5b39ab1542f5a30794a99a6ca05a2e8a860dd4308dd3246589c41eca7db3">desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java</a>
(65)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5091/files#diff-114fa25f34c56dbcea34ba46c238d567281827e0bf8155648fedbf822ce4705b">desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java</a>
(21)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/bisq-network/bisq/pull/5091.patch'>https://github.com/bisq-network/bisq/pull/5091.patch</a></li>
<li><a href='https://github.com/bisq-network/bisq/pull/5091.diff'>https://github.com/bisq-network/bisq/pull/5091.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/5091">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNXFU52ETERBFRKQ6T3S2S6MJANCNFSM4WH6HALQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNXTEBDA5HKHXN7ZBILS2S6MJA5CNFSM4WH6HAL2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4LYBBGYQ.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/5091",
"url": "https://github.com/bisq-network/bisq/pull/5091",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>