<p>This PR includes changes suggested during review of PR chain <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="725828470" data-permission-text="Title is private" data-url="https://github.com/bisq-network/bisq/issues/4672" data-hovercard-type="pull_request" data-hovercard-url="/bisq-network/bisq/pull/4672/hovercard" href="https://github.com/bisq-network/bisq/pull/4672">#4672</a> ->  <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="725866833" data-permission-text="Title is private" data-url="https://github.com/bisq-network/bisq/issues/4673" data-hovercard-type="pull_request" data-hovercard-url="/bisq-network/bisq/pull/4673/hovercard" href="https://github.com/bisq-network/bisq/pull/4673">#4673</a> ->  <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="725878129" data-permission-text="Title is private" data-url="https://github.com/bisq-network/bisq/issues/4674" data-hovercard-type="pull_request" data-hovercard-url="/bisq-network/bisq/pull/4674/hovercard" href="https://github.com/bisq-network/bisq/pull/4674">#4674</a> ->  <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="725897299" data-permission-text="Title is private" data-url="https://github.com/bisq-network/bisq/issues/4675" data-hovercard-type="pull_request" data-hovercard-url="/bisq-network/bisq/pull/4675/hovercard" href="https://github.com/bisq-network/bisq/pull/4675">#4675</a>.</p>
<p>Changes requested in those PRs are made here.</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/4679'>https://github.com/bisq-network/bisq/pull/4679</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Refactor offer/trade related classes in core and desktop</li>
  <li>Add 'takeoffer' API method</li>
  <li>Add 'confirmpaymentsent' api method</li>
  <li>Add 'confirmpaymentreceived' api method</li>
  <li>Change predicate names isPositiveXYZ -> isNonZeroXYZ</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-11fd917c7fb607dd3f9a4859a9349e498a4a4a422503e7879a25c3385408ad1d">apitest/src/test/java/bisq/apitest/ApiTestCase.java</a>
    (7)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-44d1f675626693524cb12d599245a09b4318db027c2dabd23e10cd98ceb7fd28">apitest/src/test/java/bisq/apitest/method/MethodTest.java</a>
    (36)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-c635a83c621d11fe469b4c85a89da2dc19300fd7048b1260d33cd5dc64ddd817">apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java</a>
    (65)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-32b895cb27d0c846464892e61c9a57ac1d45a05eac0edcd53fd539ec89d2948e">apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingFixedPriceTest.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-95eb2e15e7182812f9c4518c5cbbb38d3c6fbb4ca8388f4600a5c1541ad29691">apitest/src/test/java/bisq/apitest/method/offer/CreateOfferUsingMarketPriceMarginTest.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-ca35fd2cf20069360ff48c6d99283c5fea8c929024ddbdfe44d60429da2a10a1">apitest/src/test/java/bisq/apitest/method/offer/ValidateCreateOfferTest.java</a>
    (2)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-c41ca392649706fed19bf13247aeab25d0aa4ec109c93691aa2e7839b0fea70d">apitest/src/test/java/bisq/apitest/method/trade/AbstractTradeTest.java</a>
    (32)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-80fde285109a91d7581e771828393b6c87ac3b2a7e7de6ee750e7d41e594650a">apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java</a>
    (129)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-0a94ee487ea9d0b7b440b8688f6e9df897fd089fc84ead5f6cc9ca9453ad3b21">apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java</a>
    (131)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-afc5db1c8acb08dec253ee87a3e0e677c932d6826a2ab4c31ba816a4dcfb1386">cli/src/main/java/bisq/cli/CliMain.java</a>
    (50)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-5844772aef65f78f18718761e04db119b26808d950b861d038a740878d729c40">cli/src/main/java/bisq/cli/GrpcStubs.java</a>
    (3)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-fb5876d3b212d239a14d78529ac498b30a2dbb8e3f184ba9bd711a5d4901fb62">core/src/main/java/bisq/core/api/CoreApi.java</a>
    (31)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-7ab5c96db69bcc7ca05627ada97fd93b423f7df355641a7cd371d31f2039baf9">core/src/main/java/bisq/core/api/CoreTradesService.java</a>
    (128)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-3a9ff7695726e0660444b5b5e18600d2cff2bc2fcdf3f78c36a0fc3df504e1b6">core/src/main/java/bisq/core/api/model/OfferInfo.java</a>
    (44)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-5751067b75ae6f7739df840d815386f3998f04baff5de96c079f5ce1fe6b4f57">core/src/main/java/bisq/core/api/model/TradeInfo.java</a>
    (211)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-1dd9914e3d0450d8cc1aaa2f15afa9836051911a41ecb287a813f9cd4f9f5afd">core/src/main/java/bisq/core/offer/CreateOfferService.java</a>
    (84)
  </li>
  <li>
    <strong>D</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-bf3127ac4929ce9edad4c827a37f61ebd7a38945ba5720e38ceb3bab38c61ba9">core/src/main/java/bisq/core/offer/MakerFeeProvider.java</a>
    (29)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-7421f25cc1584830f6e575beb0aec9adfc30bc1360c52519f81af4d16fd3f29a">core/src/main/java/bisq/core/offer/Offer.java</a>
    (9)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-b604ee7141fcfacf2dd0aeade4bf393c4d4d93617ab327147c363539ae804496">core/src/main/java/bisq/core/offer/OfferUtil.java</a>
    (408)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-c19acb59c56bd6f03db8b9eaa772119ec8cd05b64d6a6aa86fb53f5338cf1122">core/src/main/java/bisq/core/offer/takeoffer/TakeOfferModel.java</a>
    (293)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-189dabf054a26f4cd086890f538252d6c47a246491d7d95e730ce6a0e640d786">core/src/main/java/bisq/core/payment/PaymentAccount.java</a>
    (27)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-5628741f4073603b515dea81ac8682aaba0aa5f11fe1f88eb6edeccb73779ce3">core/src/main/java/bisq/core/trade/Contract.java</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-0399e1caaadecbe847e18f0eda2ca8bf60f9777bc3bc30840e3af493601260b1">core/src/main/java/bisq/core/trade/Trade.java</a>
    (34)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-f099e762eb187f7f8b74b0d0c584dc0f4f7173e745782f8ac11466dd03926a5b">core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-ee3e6ab6efe02715d897f3f01ac2ea73097880835637201e3e8c7ac80d34fde7">core/src/main/java/bisq/core/trade/statistics/TradeStatistics3.java</a>
    (4)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-b5c0854e94496a94115cd7fa9a71c4116c00b68a34133d8285494d0a1f1a238c">core/src/main/java/bisq/core/util/VolumeUtil.java</a>
    (50)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-6900d6302ad69dc8ed6c739773413d30493c292af5d68851c02b0c5a28df1fb3">core/src/main/java/bisq/core/util/coin/CoinUtil.java</a>
    (109)
  </li>
  <li>
    <strong>D</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-b35af7717816b0a1952e3f92a1aff302bcbcd7287b9b8b68ed74b37e1a42bbe4">core/src/test/java/bisq/core/util/CoinCryptoUtilsTest.java</a>
    (60)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-a6a67fb80962e2383508f524b6814efa2af69b5cc42764e455eec28a0c18e15d">core/src/test/java/bisq/core/util/coin/CoinUtilTest.java</a>
    (56)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-5afef68b74948ae40e71a3955d52c1bfd52fa4a95fed271c6cae61626089073d">daemon/src/main/java/bisq/daemon/grpc/GrpcOffersService.java</a>
    (29)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-a80dc3f5a2446a62ffe0c63636c26c71054b77c458ce7fcdd5b02d4553e1706d">daemon/src/main/java/bisq/daemon/grpc/GrpcServer.java</a>
    (2)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-0999abe6a76f18c5be810b6c5436cea6d708c11d99ed316d0397c3ebbc6aa777">daemon/src/main/java/bisq/daemon/grpc/GrpcTradesService.java</a>
    (121)
  </li>
  <li>
    <strong>D</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-cca0a4c068e008e6030429bf66865643800e8719fc247a3575d9ecb73cebbaba">desktop/src/main/java/bisq/desktop/main/offer/MakerFeeProvider.java</a>
    (13)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-3cf8bddee5a7364f6e0018392f074e94107ee04a145a51dec551b6b7145002f6">desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java</a>
    (88)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-a110b4dbf593eb67e3a80e59506f58cd95ddbf8fe983bf3d967d8bbe2c8471fe">desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-6be5a2a3e9efad426d4520445826d641b9e78a901f8120af6c528cced19a0587">desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java</a>
    (61)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-59d7f22981909d111b6a51bb9b2a827534b61b1807c9c2fa99c4bcc7ac032960">desktop/src/main/java/bisq/desktop/main/offer/OfferDataModel.java</a>
    (31)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-114d95e19f5232dfc62f6f3ed8998dfdc01e57bc1b8bef14eee046c8e9a2b60b">desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModel.java</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-44f52aed43a10a33cdc1e6d5fbb5259696adb224cbafc78ca28d4db7e0f33dc9">desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModel.java</a>
    (8)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-e91ddc497f0b94a9a80cc234cbdcedaf05e8f40e6e1d5fc7e9c9794f97063495">desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java</a>
    (21)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-574ce6bfa753de6de705ba360ded021a7a94dcc406ad740c009483f3a2effae7">desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java</a>
    (60)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-41b34a44d2df26644ec2e93e7c7211540603530d5d8649b0545ec4963b5315d5">desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java</a>
    (7)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-ca6bbf820403f46339905b3e92bbea2ce13c25123540da103d578ccd6b3859e6">desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java</a>
    (8)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-17f0fc7fefdfe1b8cc136d009217f571fb7044c83ddad75bf497fbe7d1426f5e">desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModelTest.java</a>
    (36)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-aa41d7a47c998515957eb8e955020e46f1504aef8d5f89d48f8d944df7a5347a">desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModelTest.java</a>
    (51)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-a74597dce33e05191f03adbd9f4e95c0bab908319d123b3a2199e5cc78ec5f8f">desktop/src/test/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModelTest.java</a>
    (29)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4679/files#diff-dcb44a0045a5b02cde5bd2f45051b7d9293f87180111c7ea57f0d0eb85d0f393">proto/src/main/proto/grpc.proto</a>
    (64)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/bisq-network/bisq/pull/4679.patch'>https://github.com/bisq-network/bisq/pull/4679.patch</a></li>
  <li><a href='https://github.com/bisq-network/bisq/pull/4679.diff'>https://github.com/bisq-network/bisq/pull/4679.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/4679">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNXDBP4GCROOWCBKWNTSL4JRBANCNFSM4S2CHQCQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNUVXPHE32DWHXMNMPTSL4JRBA5CNFSM4S2CHQC2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4K2QSKOQ.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/4679",
"url": "https://github.com/bisq-network/bisq/pull/4679",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>