Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Collection Atomic Swaps support #11319

Open
wants to merge 45 commits into
base: main
Choose a base branch
from
Open

feat: Collection Atomic Swaps support #11319

wants to merge 45 commits into from
+1,251 −454

Conversation

hassnian
Copy link
Contributor

@hassnian hassnian commented Jan 1, 2025 •
edited
Loading

PR Type

  • Bugfix
  • Feature
  • Refactoring

Context

Screenshot 📸

  • My fix has changed something on UI;

Accept Collection Atomic Swap

CleanShot 2025-01-07 at 14 44 50

Offer tab in Collection

CleanShot 2025-01-08 at 11 23 20@2x

Incoming Trades & Create swap tab

@netlify Netlify
Copy link

netlify bot commented Jan 1, 2025 •
edited
Loading

✅ Deploy Preview for koda-canary ready!

Name Link
🔨 Latest commit a0a6bff
🔍 Latest deploy log https://app.netlify.com/sites/koda-canary/deploys/678107074340890008c0e161
😎 Deploy Preview https://deploy-preview-11319--koda-canary.netlify.app
📱 Preview on mobile
Toggle QR Code...

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 Netlify
Copy link

netlify bot commented Jan 1, 2025 •
edited
Loading

✅ 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...

QR Code

Use your smartphone camera to open QR code link.
Lighthouse
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.

hassnian added 15 commits January 2, 2025 07:54
@hassnian
Merge branch 'main' into issue-11116
ec8f682
@hassnian
ref(useTrades.ts): cleaner subscribeToTargetsOfTrades with better t…
f113a09 
…ypes
@hassnian
add(trades): search nft in collection input
400b9de
@hassnian
ref(transactionMintToken.ts): use isAssetHub util
80d782b
@hassnian
Merge branch 'main' into issue-11116
c3858b2 
# Conflicts:
#	components/trade/TradeOwnerButton.vue
#	components/trade/overviewModal/TradeOverviewModal.vue
#	composables/useIsTrade.ts
@hassnian
Merge branch 'main' into issue-11116
39a4dac
@hassnian
fix(TradeOwnerButton.vue): button config not reactive
8af29cc
@hassnian
add(TokenInCollection.vue): show cart item skeleton while loading
65aea48
@hassnian
ref(GalleryItemTradesTable.vue): offers naming to trdes
d56226c
@hassnian
fix(SearchInput.vue): input styles
a9d3e42
@hassnian
fix(swaps): send item copy
3f2c618
@hassnian
feat: Add TokenInCollection component to TypeSwap.vue.
bc14d25
@hassnian
fix(TokenInCollection.vue): hide search input for owner of token
cc10f5f
@hassnian
ref(TradeOverviewModal.vue): force reset of child components on modal…
9ed0c19 
… open
@hassnian
Merge branch 'main' into issue-11116
95416e5 
# Conflicts:
#	composables/useTrades.ts
@hassnian hassnian changed the title feat: Collection offer feat: Collection Atomic Swaps Jan 7, 2025
@hassnian hassnian changed the title feat: Collection Atomic Swaps feat: Accept Collection Atomic Swaps Jan 7, 2025
@hassnian hassnian marked this pull request as ready for review January 8, 2025 08:44
@hassnian hassnian marked this pull request as draft January 8, 2025 09:04
@hassnian hassnian changed the title feat: Accept Collection Atomic Swaps feat: Collection Atomic Swaps support Jan 8, 2025
hassnian added 21 commits January 9, 2025 08:11
@hassnian
Merge branch 'main' into issue-11116
9f3fca1
@hassnian
add(a-swaps): init incoming offer/swaps and ref query
f2b00c6
@hassnian
fix(WalletAssetTrades.vue): formatDistanceToNow trade created at ti…
2aacefa 
…me formatting
@hassnian
fix(WalletAssetTrades.vue): match design styles
2ba28be 
- add: button view all
- fix: styles
@hassnian
add(WalletAsset.vue): show incoming trades for supported chains
a2f358c 
- ref: move incoming trades section to the bottom
- add: translation key
@hassnian
ref(useOwnedCollections.ts): use tanstack useQuery
458658e
@hassnian
Merge branch 'main' into issue-11116
ae1b9ad
@hassnian
add(WalletAssetTrades.vue): show offered if type SWAP
c7657c9
@hassnian
fix(utils/trades.ts): wrong considered json array
c9319bc
@hassnian
fix(useTrades.ts): wrong orderby
2d24c6f 
- ref: changed prop `disableTargetsOfTrades` to `minimal`
@hassnian
add(WalletAssetTrades.vue): collection atomic swaps case
9ee2f1a
@hassnian
fix(useTrades.ts): createdAt date
2a3dbfd 
- more precise `createdAt` based on `blockNumber`
- sort treades by `createdAt` client side
@hassnian
add(WalletAssetTrades.vue): view all trades redirect
832ec3a
@hassnian
ref(WalletAssetMenu.vue): change tab nameSwap -> Create Swap
cc9e224
@hassnian
ref(WalletAssetTrades.vue): code cleanup
90942d9
@hassnian
ref(collectionEntities): simplify useOwnedCollections
735baf5 
-remove: getOwnedCollections in utils/query.ts
-add: collectionIdList query
@hassnian
ref(WalletAssetTrades.vue): reorginze code
f84c93b
@hassnian
ref(WalletAssetTrades.vue): cleaner getTradeTypeWithMoreIncomingTrades
14ad3b3
@hassnian
ref(composables/useTrades.ts): move types to components/trade/types
7c895cd
@hassnian
fix: add missing trade types
cc9844d
@hassnian
fix(TradeActivityTable.vue): remove import type
6248289
@hassnian hassnian marked this pull request as ready for review January 10, 2025 11:27
@hassnian
Copy link
Contributor Author

hassnian commented Jan 10, 2025 •
edited
Loading

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

@hassnian hassnian marked this pull request as draft January 10, 2025 11:34
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
4 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

@hassnian hassnian marked this pull request as ready for review January 10, 2025 11:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@preschian preschian Awaiting requested review from preschian

@Jarsen136 Jarsen136 Awaiting requested review from Jarsen136

At least 2 approving reviews are required to merge this pull request.

Assignees

@exezbcz exezbcz

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Incoming swaps and offers in profile sidebar
2 participants
@hassnian @exezbcz