feat: Collection Atomic Swaps support #11319

hassnian · 2025-01-01T11:55:02Z

PR Type

Bugfix
Feature
Refactoring

Context

add: offers tab in collection
add: support for collection atomic swaps
- allows accepting an atomic-swap without a desiredItem
- adapt incoming trades query
Closes Incoming swaps and offers in profile sidebar #11334
Ref Collection Atomic Swaps #11331
Ref Collection offer #11116

Screenshot 📸

My fix has changed something on UI;

Accept Collection Atomic Swap

Offer tab in Collection

Incoming Trades & Create swap tab

…n atomic swaps

netlify · 2025-01-01T11:55:23Z

✅ Deploy Preview for koda-canary ready!

Name	Link
🔨 Latest commit	`dd35d5f`
🔍 Latest deploy log	https://app.netlify.com/sites/koda-canary/deploys/678f881559259a0008df9158
😎 Deploy Preview	https://deploy-preview-11319--koda-canary.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

netlify · 2025-01-01T11:59:39Z

✅ Deploy Preview for polkadot ready!

Name	Link
🔨 Latest commit	`ec8f682`
🔍 Latest deploy log	https://app.netlify.com/sites/polkadot/deploys/677600011ca1b00008749aaa
😎 Deploy Preview	https://deploy-preview-11319--polkadot.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.
Lighthouse	1 paths audited Performance: 15 Accessibility: 83 Best Practices: 83 SEO: 81 PWA: - View the detailed breakdown and full score reports

To edit notification comments on pull requests, go to your Netlify site configuration.

…ypes

# Conflicts: # components/trade/TradeOwnerButton.vue # components/trade/overviewModal/TradeOverviewModal.vue # composables/useIsTrade.ts

… open

# Conflicts: # composables/useTrades.ts

- ref: removed duplicate code

-remove: getOwnedCollections in utils/query.ts -add: collectionIdList query

hassnian · 2025-01-10T11:28:48Z

PR is ready, I'll do another round of testing tomorrow

cc @exezbcz for visual check, let me know if i need to change the copy or something

Jarsen136 · 2025-01-13T15:33:18Z

https://deploy-preview-11319--koda-canary.netlify.app/ahk/collection/379/swaps

The offers and swaps are not shown on the collection page.

here is the error on console

hassnian · 2025-01-14T01:37:49Z

https://deploy-preview-11319--koda-canary.netlify.app/ahk/collection/379/swaps

The offers and swaps are not shown on the collection page.

here is the error on console

the issue is that some offers/swaps have wrong data due to a bug in the indexers, which has been already fixed but not deployed cc @vikiival

alternatively you can run this branch locally andreplace the indexer urls with

STICK (AHK)

https://kodadot.squids.live/stick@v13/api/graphql

SPECK (AHP)

https://kodadot.squids.live/speck@v15/api/graphql

inside utils/constants.ts

vikiival · 2025-01-14T17:28:03Z

Can promote the squids

@hassnian done

hassnian · 2025-01-15T15:52:32Z

@Jarsen136 the indexer bug is deployed , could you try again

Jarsen136 · 2025-01-15T17:02:59Z

It's still the same on the offers tab.

https://deploy-preview-11319--koda-canary.netlify.app/ahk/collection/379/swaps

There is another issue that may not related to this PR. I can click the "accept" button on the expired offer.

hassnian · 2025-01-18T07:20:30Z

It's still the same on the offers tab.

https://deploy-preview-11319--koda-canary.netlify.app/ahk/collection/379/swaps

fixed

There is another issue that may not related to this PR. I can click the "accept" button on the expired offer.

I'm using the status to either show or not show the button

for these swaps status is ACTIVE

so it's an indexer issue

cc @vikiival

data


{
  "data": {
    "swaps": [
      {
        "__typename": "Swap",
        "blockNumber": "8544830",
        "caller": "EokuN2xVQ2doATZGrwZdrumivCXD8XazC8Np5MBYqS3ucMp",
        "considered": {
          "__typename": "CollectionEntity",
          "currentOwner": "DYc9cY7q7UA3Rq97HtiobrLNbMbZgepATJtn3fzPE2jf5v6",
          "id": "493",
          "image": "ipfs://ipfs/QmZckAQZuYy5q6grmMQRmwgQJRzyLArMhRpCxHL66NBPsU",
          "name": "uwu"
        },
        "desired": null,
        "expiration": "8595230",
        "id": "379-4228294995",
        "nft": {
          "__typename": "NFTEntity",
          "collection": {
            "__typename": "CollectionEntity",
            "id": "379"
          },
          "currentOwner": "EokuN2xVQ2doATZGrwZdrumivCXD8XazC8Np5MBYqS3ucMp",
          "id": "379-4228294995",
          "image": "https://dyndata.koda.art/v1/image/ahk/379/4228294995",
          "meta": {
            "__typename": "MetadataEntity",
            "animationUrl": "ipfs://bafybeicdv7iu5racra3vsvg2k2uvp2jxvb534h67f6lqdwidhmvzg2tjou?hash=0x70f4a78a48f42acbe9d9cf154241836129f76f9f27af3a0407fc31364d9175fb",
            "description": "Artist: [LikeMurvin](https://twitter.com/LikeMurvin) \n\n\n 'Meadow' transports viewers to serene landscapes, where lush fields sway under the embrace of a gentle breeze. Each painting exudes tranquility, inviting one to wander through sun-kissed meadows adorned with vibrant wildflowers. The collection captures the timeless beauty of nature, offering a moment of escape into a world of peace and harmony.",
            "id": "https://dyndata.koda.art/v1/metadata/ahk/379/4228294995",
            "image": "https://dyndata.koda.art/v1/image/ahk/379/4228294995",
            "name": "MEADOW #496"
          },
          "name": "MEADOW #496",
          "sn": "4228294995"
        },
        "price": null,
        "status": "ACTIVE",
        "surcharge": null
      },
      {
        "__typename": "Swap",
        "blockNumber": "8505205",
        "caller": "DBih8bHEUhRbA5z8wYAa9CADKco5GFSfUadvwB67J4n5emW",
        "considered": {
          "__typename": "CollectionEntity",
          "currentOwner": "Gn84LKb5HSxc3SACayxCzKQcWESRMcT1VUCqeZURfGj6ASi",
          "id": "379",
          "image": "ipfs://bafkreic7ii2fvo3fhe557pyozhzitkfnhgmxovaebnf3shqmjiva42erb4",
          "name": "MEADOW"
        },
        "desired": {
          "__typename": "NFTEntity",
          "collection": {
            "__typename": "CollectionEntity",
            "id": "379"
          },
          "currentOwner": "DYc9cY7q7UA3Rq97HtiobrLNbMbZgepATJtn3fzPE2jf5v6",
          "id": "379-4008717980",
          "image": "https://dyndata.koda.art/v1/image/ahk/379/4008717980",
          "meta": {
            "__typename": "MetadataEntity",
            "animationUrl": "ipfs://bafybeicdv7iu5racra3vsvg2k2uvp2jxvb534h67f6lqdwidhmvzg2tjou?hash=0x9fb51ef4a431ed45998990aba028bf896911778e9bd621635e58b1cc415f7dbc",
            "description": "Artist: [LikeMurvin](https://twitter.com/LikeMurvin) \n\n\n 'Meadow' transports viewers to serene landscapes, where lush fields sway under the embrace of a gentle breeze. Each painting exudes tranquility, inviting one to wander through sun-kissed meadows adorned with vibrant wildflowers. The collection captures the timeless beauty of nature, offering a moment of escape into a world of peace and harmony.",
            "id": "https://dyndata.koda.art/v1/metadata/ahk/379/4008717980",
            "image": "https://dyndata.koda.art/v1/image/ahk/379/4008717980",
            "name": "MEADOW #467"
          },
          "name": "MEADOW #467",
          "sn": "4008717980"
        },
        "expiration": "8555605",
        "id": "379-21",
        "nft": {
          "__typename": "NFTEntity",
          "collection": {
            "__typename": "CollectionEntity",
            "id": "379"
          },
          "currentOwner": "DBih8bHEUhRbA5z8wYAa9CADKco5GFSfUadvwB67J4n5emW",
          "id": "379-21",
          "image": "ipfs://ipfs/bafkreibv6v57w6lunn2tmxxijsxgdwvc5ftz7ly7ekuxuqjxhpofr2at7u",
          "meta": {
            "__typename": "MetadataEntity",
            "animationUrl": "ipfs://bafybeicdv7iu5racra3vsvg2k2uvp2jxvb534h67f6lqdwidhmvzg2tjou/?hash=0x0cbd68d21271b14f33395a717c0cb7c3111a77fbc2ac809b2421e7e9e5d3e77e",
            "description": "Artist: [LikeMurvin](https://twitter.com/LikeMurvin) \n\n\n 'Meadow' transports viewers to serene landscapes, where lush fields sway under the embrace of a gentle breeze. Each painting exudes tranquility, inviting one to wander through sun-kissed meadows adorned with vibrant wildflowers. The collection captures the timeless beauty of nature, offering a moment of escape into a world of peace and harmony.",
            "id": "ipfs://ipfs/bafkreigr3ae35mxbo44uamrp5g2hjiw7kv55rcigisl42c6rotg7ukxzce",
            "image": "ipfs://ipfs/bafkreibv6v57w6lunn2tmxxijsxgdwvc5ftz7ly7ekuxuqjxhpofr2at7u",
            "name": "MEADOW"
          },
          "name": "MEADOW",
          "sn": "21"
        },
        "price": null,
        "status": "ACTIVE",
        "surcharge": null
      },
      {
        "__typename": "Swap",
        "blockNumber": "8505205",
        "caller": "DBih8bHEUhRbA5z8wYAa9CADKco5GFSfUadvwB67J4n5emW",
        "considered": {
          "__typename": "CollectionEntity",
          "currentOwner": "Gn84LKb5HSxc3SACayxCzKQcWESRMcT1VUCqeZURfGj6ASi",
          "id": "379",
          "image": "ipfs://bafkreic7ii2fvo3fhe557pyozhzitkfnhgmxovaebnf3shqmjiva42erb4",
          "name": "MEADOW"
        },
        "desired": {
          "__typename": "NFTEntity",
          "collection": {
            "__typename": "CollectionEntity",
            "id": "379"
          },
          "currentOwner": "DYc9cY7q7UA3Rq97HtiobrLNbMbZgepATJtn3fzPE2jf5v6",
          "id": "379-2405207167",
          "image": "https://fxart-beta.kodadot.workers.dev/metadata/v2/image?chain=ahk&collection=379&hash=0x3338cfbee1cd823000871bf0c298d9baa16f7ee5a3e23acc598a135965cc7f9b",
          "meta": {
            "__typename": "MetadataEntity",
            "animationUrl": "ipfs://bafybeicdv7iu5racra3vsvg2k2uvp2jxvb534h67f6lqdwidhmvzg2tjou/?hash=0x3338cfbee1cd823000871bf0c298d9baa16f7ee5a3e23acc598a135965cc7f9b",
            "description": "Artist: [LikeMurvin](https://twitter.com/LikeMurvin) \n\n\n 'Meadow' transports viewers to serene landscapes, where lush fields sway under the embrace of a gentle breeze. Each painting exudes tranquility, inviting one to wander through sun-kissed meadows adorned with vibrant wildflowers. The collection captures the timeless beauty of nature, offering a moment of escape into a world of peace and harmony.",
            "id": "https://fxart-beta.kodadot.workers.dev/metadata/v2/json?chain=ahk&collection=379&hash=0x3338cfbee1cd823000871bf0c298d9baa16f7ee5a3e23acc598a135965cc7f9b&sn=349",
            "image": "https://fxart-beta.kodadot.workers.dev/metadata/v2/image?chain=ahk&collection=379&hash=0x3338cfbee1cd823000871bf0c298d9baa16f7ee5a3e23acc598a135965cc7f9b",
            "name": "MEADOW #349"
          },
          "name": "MEADOW #349",
          "sn": "2405207167"
        },
        "expiration": "8555605",
        "id": "379-6",
        "nft": {
          "__typename": "NFTEntity",
          "collection": {
            "__typename": "CollectionEntity",
            "id": "379"
          },
          "currentOwner": "DBih8bHEUhRbA5z8wYAa9CADKco5GFSfUadvwB67J4n5emW",
          "id": "379-6",
          "image": "ipfs://ipfs/bafkreid6ilqfc3bky6mcuru52ykpa7ykokn7crztifh6232lbd2elkjifa",
          "meta": {
            "__typename": "MetadataEntity",
            "animationUrl": "ipfs://bafybeicdv7iu5racra3vsvg2k2uvp2jxvb534h67f6lqdwidhmvzg2tjou/?hash=0x6198179e7f30dc268ab00411f993d654cdf5785e9b82f809807cec6326e533a6",
            "description": "Artist: [LikeMurvin](https://twitter.com/LikeMurvin) \n\n\n 'Meadow' transports viewers to serene landscapes, where lush fields sway under the embrace of a gentle breeze. Each painting exudes tranquility, inviting one to wander through sun-kissed meadows adorned with vibrant wildflowers. The collection captures the timeless beauty of nature, offering a moment of escape into a world of peace and harmony.",
            "id": "ipfs://ipfs/bafkreihpccu7bcjt5u7s3qny467majnqfaj6hfozwoxufgfqhdia2ym66i",
            "image": "ipfs://ipfs/bafkreid6ilqfc3bky6mcuru52ykpa7ykokn7crztifh6232lbd2elkjifa",
            "name": "MEADOW"
          },
          "name": "MEADOW",
          "sn": "6"
        },
        "price": null,
        "status": "ACTIVE",
        "surcharge": null
      },
      {
        "__typename": "Swap",
        "blockNumber": "8371368",
        "caller": "G5HzxgmKtBzFX9E7Ym9to3gH2cr722v1Wamj1w8GjzWJJ4e",
        "considered": {
          "__typename": "CollectionEntity",
          "currentOwner": "Gn84LKb5HSxc3SACayxCzKQcWESRMcT1VUCqeZURfGj6ASi",
          "id": "352",
          "image": "ipfs://bafkreidkkkekoom6crzf2rjuycjwawvmnzdct336bic5i6pxs6oy3ondge",
          "name": "Complexity"
        },
        "desired": {
          "__typename": "NFTEntity",
          "collection": {
            "__typename": "CollectionEntity",
            "id": "352"
          },
          "currentOwner": "J23zaM8DDUewdGtrS8Vo7VSiTYrwaKpKdQ5qTTp5BDQNaMs",
          "id": "352-2405350561",
          "image": "https://fxart-beta.kodadot.workers.dev/metadata/v2/image?chain=ahk&collection=352&hash=0x8c18210df0d9514f2d2e5d8ca7c100978219ee80d3968ad850ab5ead208287b3",
          "meta": {
            "__typename": "MetadataEntity",
            "animationUrl": "ipfs://bafybeic4xh3jbctxh5eaommwlsoli6gx2vut2k2kymfromx2unsqm7qdoa/?hash=0x8c18210df0d9514f2d2e5d8ca7c100978219ee80d3968ad850ab5ead208287b3",
            "description": "Artist: [@NoMonetaryValue](https://kodadot.xyz) \n\n\n The most complex hints for life can be hidden in the simplest abstractions.",
            "id": "https://fxart-beta.kodadot.workers.dev/metadata/v2/json?chain=ahk&collection=352&sn=100",
            "image": "https://fxart-beta.kodadot.workers.dev/metadata/v2/image?chain=ahk&collection=352&hash=0x8c18210df0d9514f2d2e5d8ca7c100978219ee80d3968ad850ab5ead208287b3",
            "name": "Complexity #100"
          },
          "name": "Complexity #100",
          "sn": "2405350561"
        },
        "expiration": "8421768",
        "id": "379-102",
        "nft": {
          "__typename": "NFTEntity",
          "collection": {
            "__typename": "CollectionEntity",
            "id": "379"
          },
          "currentOwner": "G5HzxgmKtBzFX9E7Ym9to3gH2cr722v1Wamj1w8GjzWJJ4e",
          "id": "379-102",
          "image": "ipfs://ipfs/bafybeicsgfk5eihpbipashqbfxmh3hsjpntmds2hwznmeguq6wx3ssbzvq",
          "meta": {
            "__typename": "MetadataEntity",
            "animationUrl": "ipfs://bafybeicdv7iu5racra3vsvg2k2uvp2jxvb534h67f6lqdwidhmvzg2tjou/?hash=0xc53df2971e9ac6f1d30bb52e477e3aeb6a5d91d782a1f3fa5c8993fb995a8e38",
            "description": "Artist: [LikeMurvin](https://twitter.com/LikeMurvin) \n\n\n 'Meadow' transports viewers to serene landscapes, where lush fields sway under the embrace of a gentle breeze. Each painting exudes tranquility, inviting one to wander through sun-kissed meadows adorned with vibrant wildflowers. The collection captures the timeless beauty of nature, offering a moment of escape into a world of peace and harmony.",
            "id": "ipfs://ipfs/bafkreiepjfwug4pnxzgdzb6glhq2o2itzxsps5hcg7lluubawpbvyiaahq",
            "image": "ipfs://ipfs/bafybeicsgfk5eihpbipashqbfxmh3hsjpntmds2hwznmeguq6wx3ssbzvq",
            "name": "MEADOW"
          },
          "name": "MEADOW",
          "sn": "102"
        },
        "price": null,
        "status": "ACTIVE",
        "surcharge": null
      }
    ]
  }
}

vikiival · 2025-01-19T16:29:43Z

I'm using the status to either show or not show the button for these swaps status is ACTIVE so it's an indexer issue cc @vikiival

Can you please open an issue at kodadot/stick ?
or if you know where the bug could be PR is welcomed

sonarqubecloud · 2025-01-21T11:42:56Z

Quality Gate passed

Issues
3 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

add: offers tab in collections & init support for non specific toke…

7d3c2b5

…n atomic swaps

hassnian added 15 commits January 2, 2025 07:54

Merge branch 'main' into issue-11116

ec8f682

ref(useTrades.ts): cleaner subscribeToTargetsOfTrades with better t…

f113a09

…ypes

add(trades): search nft in collection input

400b9de

ref(transactionMintToken.ts): use isAssetHub util

80d782b

Merge branch 'main' into issue-11116

c3858b2

# Conflicts: # components/trade/TradeOwnerButton.vue # components/trade/overviewModal/TradeOverviewModal.vue # composables/useIsTrade.ts

Merge branch 'main' into issue-11116

39a4dac

fix(TradeOwnerButton.vue): button config not reactive

8af29cc

add(TokenInCollection.vue): show cart item skeleton while loading

65aea48

ref(GalleryItemTradesTable.vue): offers naming to trdes

d56226c

fix(SearchInput.vue): input styles

a9d3e42

fix(swaps): send item copy

3f2c618

feat: Add TokenInCollection component to TypeSwap.vue.

bc14d25

fix(TokenInCollection.vue): hide search input for owner of token

cc10f5f

ref(TradeOverviewModal.vue): force reset of child components on modal…

9ed0c19

… open

Merge branch 'main' into issue-11116

95416e5

# Conflicts: # composables/useTrades.ts

hassnian changed the title ~~feat: Collection offer~~ feat: Collection Atomic Swaps Jan 7, 2025

hassnian changed the title ~~feat: Collection Atomic Swaps~~ feat: Accept Collection Atomic Swaps Jan 7, 2025

hassnian added 7 commits January 7, 2025 18:48

add(TradeOverviewModal.vue): missing send item events and prop

e0eadd5

ref(TradeOwnerButton.vue): hide counter swap button for collection swaps

e40fc4a

Merge branch 'main' into issue-11116

b010710

fix(TokenSearchInput.vue): search item results styles

137d9a6

ref(TradeOverviewModal.vue): unify content of modal based on types

8bbafd2

- ref: removed duplicate code

ref(TokenSearchInput.vue): remove any

b592c81

ref(TradeFilter.vue): plurar translation

a110ddc

hassnian requested review from preschian and Jarsen136 January 8, 2025 08:44

hassnian marked this pull request as ready for review January 8, 2025 08:44

hassnian added 8 commits January 10, 2025 12:25

ref(WalletAssetMenu.vue): change tab nameSwap -> Create Swap

cc9e224

ref(WalletAssetTrades.vue): code cleanup

90942d9

ref(collectionEntities): simplify useOwnedCollections

735baf5

-remove: getOwnedCollections in utils/query.ts -add: collectionIdList query

ref(WalletAssetTrades.vue): reorginze code

f84c93b

ref(WalletAssetTrades.vue): cleaner getTradeTypeWithMoreIncomingTrades

14ad3b3

ref(composables/useTrades.ts): move types to components/trade/types

7c895cd

fix: add missing trade types

cc9844d

fix(TradeActivityTable.vue): remove import type

6248289

hassnian marked this pull request as ready for review January 10, 2025 11:27

hassnian assigned exezbcz Jan 10, 2025

hassnian marked this pull request as draft January 10, 2025 11:34

fix(trades): add missing type import

a0a6bff

hassnian marked this pull request as ready for review January 10, 2025 11:40

fix: add missing trade type imports

f68946b

hassnian added 4 commits January 17, 2025 09:33

Merge branch 'main' into issue-11116

1573e03

fix(SearchInput.vue): text color

d2672c0

fix(TradeOverviewModal.vue): can't accept token specific trades

7cd6777

fix(useTrades.ts): trades table loading forever when empty

7c785e7

ref(utils/trades.ts): simplify regex and query stringify

fc72445

hassnian mentioned this pull request Jan 20, 2025

Expired swaps are still ACTIVE kodadot/stick#332

Closed

Merge branch 'main' into issue-11116

dd35d5f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Collection Atomic Swaps support #11319

feat: Collection Atomic Swaps support #11319

hassnian commented Jan 1, 2025 •

edited

Loading

netlify bot commented Jan 1, 2025 •

edited

Loading

netlify bot commented Jan 1, 2025 •

edited

Loading

hassnian commented Jan 10, 2025 •

edited

Loading

Jarsen136 commented Jan 13, 2025

hassnian commented Jan 14, 2025 •

edited

Loading

vikiival commented Jan 14, 2025 •

edited

Loading

hassnian commented Jan 15, 2025 •

edited

Loading

Jarsen136 commented Jan 15, 2025

hassnian commented Jan 18, 2025 •

edited

Loading

vikiival commented Jan 19, 2025

sonarqubecloud bot commented Jan 21, 2025

feat: Collection Atomic Swaps support #11319

Are you sure you want to change the base?

feat: Collection Atomic Swaps support #11319

Conversation

hassnian commented Jan 1, 2025 • edited Loading

PR Type

Context

Screenshot 📸

Accept Collection Atomic Swap

Offer tab in Collection

Incoming Trades & Create swap tab

netlify bot commented Jan 1, 2025 • edited Loading

✅ Deploy Preview for koda-canary ready!

netlify bot commented Jan 1, 2025 • edited Loading

✅ Deploy Preview for polkadot ready!

hassnian commented Jan 10, 2025 • edited Loading

Jarsen136 commented Jan 13, 2025

hassnian commented Jan 14, 2025 • edited Loading

vikiival commented Jan 14, 2025 • edited Loading

hassnian commented Jan 15, 2025 • edited Loading

Jarsen136 commented Jan 15, 2025

hassnian commented Jan 18, 2025 • edited Loading

vikiival commented Jan 19, 2025

sonarqubecloud bot commented Jan 21, 2025

Quality Gate passed

hassnian commented Jan 1, 2025 •

edited

Loading

netlify bot commented Jan 1, 2025 •

edited

Loading

netlify bot commented Jan 1, 2025 •

edited

Loading

hassnian commented Jan 10, 2025 •

edited

Loading

hassnian commented Jan 14, 2025 •

edited

Loading

vikiival commented Jan 14, 2025 •

edited

Loading

hassnian commented Jan 15, 2025 •

edited

Loading

hassnian commented Jan 18, 2025 •

edited

Loading