Fix/conflicts #758
Merged
Fix/conflicts #758
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* feat: add tx history for evm * feat: add `0xStorageRent` to script address * feat: update cadence replace placeholder logic * feat： replace content with compact * feat: remove storeage toast * Sync with main (#702) * feat： Bump version 2.3.1 * fix: restore error with multi-backup * feat: update version * fix: sync to async when call alert * fix： update sync to async on main queue --------- Co-authored-by: cat <zhouxl72@126.com> * feat: add View More on history of evm * feat: update history status on evm * feat: as 2 separate text instead of one on history list * fix: walletconnect panding request unable to identify sender --------- Co-authored-by: cat <zhouxl72@126.com>
# Conflicts: # FRW.xcodeproj/project.pbxproj # FRW/App/Env/Prod/Info.plist # FRW/Modules/MultiBackup/ViewModel/BackupUploadViewModel.swift # FRW/Modules/NFT/NFTModel/NFTCollectionStateManager.swift
jaymengxy
approved these changes
Jan 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related Issue
fix conflict from develop to main
Summary of Changes
Need Regression Testing
Risk Assessment
Additional Notes
Screenshots (if applicable)