-
Notifications
You must be signed in to change notification settings - Fork 6
Sync with main #898
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.
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
Merged
Sync with main #898
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
* 85 Remove swap/buy for non-FLOW assets on Flow Wallet mobile onflow/FRW#85 * - Updated the logic - Swap button hidden when the token is neither evm nor cadence * - Fixed checks for evm and flow coins * - Refactored to embed the token type inside the token model rather than determining it from the outside. * fix: Incorrect Warning Message Displayed When Sending FT #461 * [BUG] External image usage #765 #765 Removed unused URL. * feat: UI for Remove swap/buy for non-FLOW assets #85 * [BUG] Receive QR codes blank #797 (#799) #797 Co-authored-by: Marty Ulrich <marty.ulrich@flowfoundation.org> * [FEATURE] Add an alert when user tries to back out of the backup flow #791 (#805) Co-authored-by: Marty Ulrich <marty.ulrich@flowfoundation.org> * Code copied from https://github.com/markiv/SwiftUI-Shimmer without acknowledgement. #806 (#807) Co-authored-by: Marty Ulrich <marty.ulrich@flowfoundation.org> * 788 misc priority fixes (#789) * Remove "Move Assets" button from home screen * Strings tweaks Make whole "Welcome" cell tappable. * remove "Maybe Later" to force backing up keys. * Stake button on the dashboard should open the “Node providers list” directly, not show an empty staking list if the user has not already staked * In send, it should default to open the “My accounts” tab and have it as the left-most item. * fix localization fix backwards light/dark mode for help icon * Remove the “view” tab on top Fix the “Apps” title to be the same height as the title on the collections page. * remove extra List/Grid toggle. --------- Co-authored-by: Marty Ulrich <marty.ulrich@flowfoundation.org> * Feat/instabug (#812) * feat: update instabug version and add upload dsym * feat: add log * feat: update path of shell file * feat: Account storage improvements #61 (#810) * [FEATURE] Move Transaction History to be a bottom tab-bar item #790 (#814) * [FEATURE] Move Transaction History to be a bottom tab-bar item #790 [FEATURE] Update tab bar icons #813 * update tab bar to new designs --------- Co-authored-by: Marty Ulrich <marty.ulrich@flowfoundation.org> * Create CODEOWNERS (#747) * Tab icons disappear in Light Mode #821 (#822) Co-authored-by: Marty Ulrich <marty.ulrich@flowfoundation.org> * Delete .github./ISSUE_TEMPLATE/bug_report.yml (#746) * Create check-linked-issues.yml (#744) * Create check-linked-issues.yml.yml * Rename check-linked-issues.yml.yml to check-linked-issues.yml * fix: #819 receiver incorret warning when send (#824) * [107] Fix opensea connect issue (#830) * Allow multi-scoped WalletConnect sessions (#815) * Allow multiple namespaces for WalletConnect sessions * cleanup * remove comments * cleanup * cleanup * Fix current logic * cleanup * format * Remove non-null assertion * Remove unused fields * feat: #784 add missing field `network` (#828) * Bump version 2.3.7 (#842) * 843 bug issues on release 237 (#846) * feat: update UI #843 * feat: add icon #843 * feat: update icloud icon # 843 (#848) * feat: update icloud icon # 843 * feat: remove clear button * feat: update multibackup icon #834 * fix: zindex * [787] Handle account selection during move accounts. (#861) * Add FT balance handler * Refactor FT fetch code * Duplicate token balance view * Add loading state for token list * Add swap and UI polish * Handle same account selection * UI polishing * Handle testnet flow token model * Update TokenBalanceHandler.swift * Cleanup NFT API * Replace remain endpoint * Add NFT collection detail * Cleanup logic * UI polishing * Simplify the logic * Update equal logic * [797] Fix QRcode is not rendered sometimes (#865) Fix QRcode is not rendered sometimes * fix: Theme color issue #863 (#866) * [869] Hide backup tips for now (#870) Hide backup tips for now * [867] Fix NFT bridge issue between child and EVM (#868) Fix NFT bridge issue between child and EVM * Add checksum after get COA address (#864) Co-authored-by: lmcmz <lmcmze@gmail.com> * 834 feature design updates (#858) * Make delete wallet button destructive * Tapping the selected tab messes up the selected indicator's offset. * "Let's get started" screen * Update CreateProfileWaitingView. Add AccountCreatedView * Update Device Backup List * Update home screen * show back button for transaction list view if it's not the root view * Update token details screen * Update token details screen * scan tweak * Always use white * fix tab bar height * Hide tab bar for FTUE * added url links to disclaimer * fix wallet action buttons on wallet home page * remove onboarding flow. * fix: redownload app profile is empty * fix FTUE navigation/Lottie view/notification screen showing up early * fix bad name * Make links in disclaimer match mocks. Text color. * fix "or" centering. color tweaks. * tweaks * UI updates for Profile screen * Explore tab updates * padding tweak * Remove line limit * Explore screen tweaks * Fix Explore tab icon. * Only show push notification reminder once per app launch. * force webview to dark mode * feat: fix UI on empty wallet view * [834] Add navigation swipe back control (#877) --------- Co-authored-by: Marty Ulrich <marty.ulrich@flowfoundation.org> Co-authored-by: cat <zhouxl72@126.com> Co-authored-by: Hao <lmcmze@gmail.com> * [861] Update move icon (#878) Update move icon * feat: 872 handle all case of account type (#873) Co-authored-by: Hao <lmcmze@gmail.com> * update UI and logic (#883) * feat: set default theme is dark * feat: update empty wallet recent height and add loading status * fix: flow -> coa, none Flow Token, use bridge_tokens_to_evm_v2 * feat: remove staking ad page * fix: show swap when account is coa * UI fix (#881) * Navigate Disney and TS to App Store * Fix flow token issue incorrect in evm account * Add Privacy police and terms of service in about page * Add profile switch flag * [881] Update profile switch flag logic (#884) * Navigate Disney and TS to App Store * Fix flow token issue incorrect in evm account * Add Privacy police and terms of service in about page * Add profile switch flag * Update logic with defer * feat: update version to 2.3.8 (#887) * feat: update version to 2.3.8 * feat: update version 2.3.8 * fix: add padding (#891) Co-authored-by: Hao <lmcmze@gmail.com> * Handle reset wallet in empty view * fix: wallet confirmation pop up page in light mode is hard to read (#894) --------- Co-authored-by: Antonio Bello <1085903+jeden@users.noreply.github.com> Co-authored-by: cat <zhouxl72@126.com> Co-authored-by: marty <marty@martyulrich.com> Co-authored-by: Marty Ulrich <marty.ulrich@flowfoundation.org> Co-authored-by: Jordan Ribbink <17958158+jribbink@users.noreply.github.com>
zhouxl
approved these changes
Feb 28, 2025
martyu
approved these changes
Feb 28, 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.
85 Remove swap/buy for non-FLOW assets on Flow Wallet mobile [BUG] Remove swap/buy for non-FLOW assets on Flow Wallet mobile FRW#85
fix: Incorrect Warning Message Displayed When Sending FT [BUG] Incorrect Warning Message Displayed When Sending FT/NFT on iOS #461
[BUG] External image usage [BUG] External image usage #765
#765
Removed unused URL.
feat: UI for Remove swap/buy for non-FLOW assets UI - Move FT Assets between VM #85
[BUG] Receive QR codes blank [BUG] Receive QR codes blank #797 ([BUG] Receive QR codes blank #797 #799)
#797
[FEATURE] Add an alert when user tries to back out of the backup flow [FEATURE] Add an alert when user tries to back out of the backup flow #791 ([FEATURE] Add an alert when user tries to back out of the backup flow #791 #805)
Code copied from https://github.com/markiv/SwiftUI-Shimmer without acknowledgement. Code copied from https://github.com/markiv/SwiftUI-Shimmer without acknowledgement. #806 (Code copied from https://github.com/markiv/SwiftUI-Shimmer without ac… #807)
788 misc priority fixes (788 misc priority fixes #789)
Remove "Move Assets" button from home screen
Strings tweaks Make whole "Welcome" cell tappable.
remove "Maybe Later" to force backing up keys.
Stake button on the dashboard should open the “Node providers list” directly, not show an empty staking list if the user has not already staked
In send, it should default to open the “My accounts” tab and have it as the left-most item.
fix localization fix backwards light/dark mode for help icon
Remove the “view” tab on top Fix the “Apps” title to be the same height as the title on the collections page.
remove extra List/Grid toggle.
Feat/instabug (Feat/instabug #812)
feat: update instabug version and add upload dsym
feat: add log
feat: update path of shell file
feat: Account storage improvements 账户创建失败 #61 (feat: Account storage improvements #61 #810)
[FEATURE] Move Transaction History to be a bottom tab-bar item [FEATURE] Move Transaction History to be a bottom tab-bar item #790 ([FEATURE] Move Transaction History to be a bottom tab-bar item #790 #814)
[FEATURE] Move Transaction History to be a bottom tab-bar item [FEATURE] Move Transaction History to be a bottom tab-bar item #790 [FEATURE] Update tab bar icons [FEATURE] Update tab bar icons #813
update tab bar to new designs
Create CODEOWNERS (Create CODEOWNERS #747)
Tab icons disappear in Light Mode [BUG] Tab icons disappear in Light Mode #821 (Tab icons disappear in Light Mode #821 #822)
Delete .github./ISSUE_TEMPLATE/bug_report.yml (Delete .github./ISSUE_TEMPLATE/bug_report.yml #746)
Create check-linked-issues.yml (Create check-linked-issues.yml #744)
Create check-linked-issues.yml.yml
Rename check-linked-issues.yml.yml to check-linked-issues.yml
fix: [BUG] Incorrect receiver vault setup warning when moving FT #819 receiver incorret warning when send (fix: #819 receiver incorret warning when send #824)
[107] Fix opensea connect issue ([829] Fix opensea connect issue #830)
Allow multi-scoped WalletConnect sessions (Allow multi-scoped WalletConnect sessions #815)
Allow multiple namespaces for WalletConnect sessions
cleanup
remove comments
cleanup
cleanup
Fix current logic
cleanup
format
Remove non-null assertion
Remove unused fields
feat: [BUG] Discrepancy in Account Proof Response: network field missing and potential issue with uid and endpoint fields #784 add missing field
network(feat: #784 add missing fieldnetwork#828)Bump version 2.3.7 (Bump version 2.3.7 #842)
843 bug issues on release 237 (843 bug issues on release 237 #846)
feat: update UI [BUG] Issues on release 2.3.7 #843
feat: add icon [BUG] Issues on release 2.3.7 #843
feat: update icloud icon # 843 (feat: update icloud icon # 843 #848)
feat: update icloud icon # 843
feat: remove clear button
feat: update multibackup icon [FEATURE] Design updates #834
fix: zindex
[787] Handle account selection during move accounts. ([787] Handle account selection during move accounts. #861)
Add FT balance handler
Refactor FT fetch code
Duplicate token balance view
Add loading state for token list
Add swap and UI polish
Handle same account selection
UI polishing
Handle testnet flow token model
Update TokenBalanceHandler.swift
Cleanup NFT API
Replace remain endpoint
Add NFT collection detail
Cleanup logic
UI polishing
Simplify the logic
Update equal logic
[797] Fix QRcode is not rendered sometimes ([797] Fix QRcode is not rendered sometimes #865)
Fix QRcode is not rendered sometimes
fix: Theme color issue Theme color issue #863 (fix: Theme color issue #863 #866)
[869] Hide backup tips for now ([869] Hide backup tips for now #870)
Hide backup tips for now
Fix NFT bridge issue between child and EVM
Add checksum after get COA address (Add checksum after get COA address #864)
834 feature design updates (834 feature design updates #858)
Make delete wallet button destructive
Tapping the selected tab messes up the selected indicator's offset.
"Let's get started" screen
Update CreateProfileWaitingView. Add AccountCreatedView
Update Device Backup List
Update home screen
show back button for transaction list view if it's not the root view
Update token details screen
Update token details screen
scan tweak
Always use white
fix tab bar height
Hide tab bar for FTUE
added url links to disclaimer
fix wallet action buttons on wallet home page
remove onboarding flow.
fix: redownload app profile is empty
fix FTUE navigation/Lottie view/notification screen showing up early
fix bad name
Make links in disclaimer match mocks. Text color.
fix "or" centering. color tweaks.
tweaks
UI updates for Profile screen
Explore tab updates
padding tweak
Remove line limit
Explore screen tweaks
Fix Explore tab icon.
Only show push notification reminder once per app launch.
force webview to dark mode
feat: fix UI on empty wallet view
[834] Add navigation swipe back control ([834] Add navigation swipe back control #877)
Update move icon
feat: 872 handle all case of account type (feat: 872 handle all case of account type #873)
update UI and logic (update UI and logic #883)
feat: set default theme is dark
feat: update empty wallet recent height and add loading status
fix: flow -> coa, none Flow Token, use bridge_tokens_to_evm_v2
feat: remove staking ad page
fix: show swap when account is coa
UI fix (UI fix #881)
Navigate Disney and TS to App Store
Fix flow token issue incorrect in evm account
Add Privacy police and terms of service in about page
Add profile switch flag
[881] Update profile switch flag logic ([881] Update profile switch flag logic #884)
Navigate Disney and TS to App Store
Fix flow token issue incorrect in evm account
Add Privacy police and terms of service in about page
Add profile switch flag
Update logic with defer
feat: update version to 2.3.8 (feat: update version to 2.3.8 #887)
feat: update version to 2.3.8
feat: update version 2.3.8
fix: add padding (fix: add padding #891)
Handle reset wallet in empty view
fix: wallet confirmation pop up page in light mode is hard to read (fix: wallet confirmation pop up page in light mode is hard to read #894)
Related Issue
Summary of Changes
Need Regression Testing
Risk Assessment
Additional Notes
Screenshots (if applicable)