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

2.7.4 - merge to master #612

Merged
merged 114 commits into from
Feb 25, 2025
Merged

2.7.4 - merge to master #612

merged 114 commits into from
Feb 25, 2025

Conversation

tombeckenham
Copy link
Collaborator

Related Issue

Closes #595

Summary of Changes

Merging changes to master for 2.7.4 - NFT Focus

Need Regression Testing

  • Yes
  • No

Risk Assessment

  • Low
  • Medium
  • High

bthaile and others added 30 commits February 18, 2025 11:25
@bthaile
checkpoint on ui updates
0b225f4
@bthaile
reorg icon button comp
f6659a6
@bthaile
fix active tab sytling with icons
7bd3788
@bthaile
update nft empty states
a99f312
@bthaile
remove old button row
8bd23a3
@bthaile
style NFT List tab which is now default
b6ba2c4
@bthaile
update styling of empty status comp, list tab and token list
b771ee4
@bthaile
few margin spacing tweaks
121d5cf
@zzggo @bthaile
fixed: debugging the gridtab view
712e724
@zzggo @bthaile
fixed: show enable list
75b7563
@zzggo @bthaile
fixed: infinite scroll
eb90675
@zzggo @bthaile
fixed: move nft user info
aeb7317
@bthaile
fix conflicts again
b4620ad
@bthaile
fix lint errors
4801201
@bthaile
remove new files not needed
1537726
@bthaile
remove new files not needed
cdeebb3
@bthaile
fix url for send tokens on button row
cd7872c
@bthaile
remove unused icon
452a8f8
@zzggo
fixed: change address use it here
307b44c
@bthaile
consolidated to one EmptyStatus component, removed margin to remove d…
0c9a379 
…ouble scrolling
@bthaile
Merge branch 'dev' into ui-updates
af6b2c6
@tombeckenham
Corrected import
353c703
@zzggo
fixed: remove unused store
31d4002
@zzggo
fixed: rendering loop in evm list
cc9fcae
@zzggo
Merge branch 'ui-updates' into 557-feature-cache-the-evm-nft-list-in-…
bb020be 
…the-background
@tombeckenham
Moved useContact to a new hook (temp fix)
cb37ec2
@zzggo
Merge pull request #559 from onflow/556-bug-nft-child-accessible-cade…
4ab4a9b 
…nce-bug

fixed: change address use it here
@zzggo
feat: move the api calls into wallet controller, add storage to testt…
6f418d3 
… behavior
@zzggo
feat: added nft cache for evm nfts
6568def
@bthaile
Merge pull request #539 from onflow/ui-updates
9b9afdf 
UI updates
@tombeckenham tombeckenham changed the title fixed: update the find conttract in send child nft to evm 2.7.4 - merge to master Feb 25, 2025
zzggo and others added 2 commits February 25, 2025 20:40
@zzggo
fixed: delete code
ce9804a
@zzggo
Merge pull request #614 from onflow/613-bug-failed-to-send-nft-from-c…
0739a4b 
…hild-account-to-flow-account

fixed: use the correct nft collection cache
@tombeckenham
Corrected handling of addressbook fetch errors. Now sets tab to accou…
a18336d 
…nts for both EVM and Cadence when sending NFTS

Closes #499
@tombeckenham
Merge pull request #615 from onflow:499-send-workflow-shift-tab-order…
aa783b9 
…-evm

Corrected handling of addressbook fetch errors. Now sets tab to accounts for both EVM and Cadence when sending NFTS
@zzggo
Merge pull request #617 from onflow/616-bug-correct-name-of-account-i…
905d55b 
…n-child-account-batch-move-nft-page

fixed: correctly display the icon on move popup
@tombeckenham tombeckenham merged commit 71c56b5 into master Feb 25, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lmcmz lmcmz Awaiting requested review from lmcmz

@zzggo zzggo Awaiting requested review from zzggo

@Peppermint1020 Peppermint1020 Awaiting requested review from Peppermint1020

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

2.7.4 version
4 participants
@tombeckenham @zzggo @bthaile @Kay-Zee