<p><span class="issue-keyword tooltipped tooltipped-se" aria-label="This pull request closes issue #1101.">Closes</span> <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="283088673" data-permission-text="Title is private" data-url="https://github.com/bisq-network/bisq/issues/1101" data-hovercard-type="issue" data-hovercard-url="/bisq-network/bisq/issues/1101/hovercard" href="https://github.com/bisq-network/bisq/issues/1101">#1101</a></p>
<p>This is built on top of <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> and <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="788597169" data-permission-text="Title is private" data-url="https://github.com/bisq-network/bisq/issues/5091" data-hovercard-type="pull_request" data-hovercard-url="/bisq-network/bisq/pull/5091/hovercard" href="https://github.com/bisq-network/bisq/pull/5091">#5091</a>.<br>
The code for this PR is contained in <a class="commit-link" data-hovercard-type="commit" data-hovercard-url="https://github.com/bisq-network/bisq/commit/e11209d395bfcea22b7bfd07d38f6137c6144664/hovercard" href="https://github.com/bisq-network/bisq/commit/e11209d395bfcea22b7bfd07d38f6137c6144664"><tt>e11209d</tt></a></p>
<hr>
<p><a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/47253594/104983679-de267a80-59d2-11eb-9c2d-583bae1e73ac.png"><img src="https://user-images.githubusercontent.com/47253594/104983679-de267a80-59d2-11eb-9c2d-583bae1e73ac.png" alt="image" style="max-width:100%;"></a></p>
<hr>
<p><a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/47253594/104983611-b800da80-59d2-11eb-8f1b-f805f5c4e19f.png"><img src="https://user-images.githubusercontent.com/47253594/104983611-b800da80-59d2-11eb-8f1b-f805f5c4e19f.png" alt="image" 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/5092'>https://github.com/bisq-network/bisq/pull/5092</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>
<li>Fix apostrophe; add message about discussing reason for payment text.</li>
<li>Add payment method "Cash by mail"</li>
</ul>
<h4>File Changes</h4>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-7421f25cc1584830f6e575beb0aec9adfc30bc1360c52519f81af4d16fd3f29a">core/src/main/java/bisq/core/offer/Offer.java</a>
(4)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-0e130456e5fb2313c463d48b2112d64f0c71544eb136dfd2069f78daa405e032">core/src/main/java/bisq/core/offer/OfferPayload.java</a>
(1)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-b604ee7141fcfacf2dd0aeade4bf393c4d4d93617ab327147c363539ae804496">core/src/main/java/bisq/core/offer/OfferUtil.java</a>
(5)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-5170c7a5fd63ea83140cb0a115acd4214a35c47814e64d2c914850fcc829086b">core/src/main/java/bisq/core/payment/CashByMailAccount.java</a>
(56)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-11507f8864c1ddf3d166bb552b66dc80532ae543d294f2e12c98ab21278e922c">core/src/main/java/bisq/core/payment/PaymentAccountFactory.java</a>
(2)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-c1dce91d6bb45857011825511fe26c76915b08aed0e61e567622615840d1f7ad">core/src/main/java/bisq/core/payment/payload/CashByMailAccountPayload.java</a>
(124)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-7285b76673c0ec9ca7667bf342d8e14424c33eeb69f155c01d1e582c0714a8ba">core/src/main/java/bisq/core/payment/payload/F2FAccountPayload.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-4dcea846295ebb8de4e9633b0440ee222f5535c12fb168576b11e674e04ce60f">core/src/main/java/bisq/core/payment/payload/PaymentMethod.java</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-ebf0517b78fd6fd90d4a92f2b50757fe17da8d8c7d185ea9836c7b22ffba1989">core/src/main/java/bisq/core/proto/CoreProtoResolver.java</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-a6cc570e0f56a36136791beae8f497706216230467708be9343344cd953e5f08">core/src/main/resources/i18n/displayStrings.properties</a>
(59)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-9808f1d8417f149061f424f65cdfb55544b5cc9c95f5cd24fd373ce75cdcdf5a">desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java</a>
(159)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-17a6a0010b4a5c395a866bedcd048e25f8ca71db6060fb0983d558e8c9a27407">desktop/src/main/java/bisq/desktop/components/paymentmethods/F2FForm.java</a>
(8)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/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/5092/files#diff-c5abb5ef938520e00047e774840a1990b4210c048e3f3fdf7478edca3935c0cb">desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java</a>
(19)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-f7a4fc19540dc68f41d27e9c6e7908c737a95e8e544b1e4f8f4d280d2267ee2f">desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-214c3fde0c2679fb11f48e88acdae6f0c03835adcdd76542830a3f3dc1392d8f">desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java</a>
(11)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/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/5092/files#diff-6b3e5b39ab1542f5a30794a99a6ca05a2e8a860dd4308dd3246589c41eca7db3">desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java</a>
(73)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-114fa25f34c56dbcea34ba46c238d567281827e0bf8155648fedbf822ce4705b">desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java</a>
(23)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-f568f12c2bfc6dbc58d9febcb43af914211df1bf6481b4a5a30172270c245595">desktop/src/main/java/bisq/desktop/util/validation/EmailValidator.java</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/bisq-network/bisq/pull/5092/files#diff-51dcd1d852312df65738ff2bd493fdb0f187f50fb7d7324158c8b57fc1de7da7">proto/src/main/proto/pb.proto</a>
(7)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/bisq-network/bisq/pull/5092.patch'>https://github.com/bisq-network/bisq/pull/5092.patch</a></li>
<li><a href='https://github.com/bisq-network/bisq/pull/5092.diff'>https://github.com/bisq-network/bisq/pull/5092.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/5092">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNXLK3JFPK42LA6HI6DS2T3LDANCNFSM4WIEJCGQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNQXAGYWSMYGVJD4BH3S2T3LDA5CNFSM4WIEJCG2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4LYCGWQQ.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/5092",
"url": "https://github.com/bisq-network/bisq/pull/5092",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>