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.

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

[Release] 2.5.23 #249

Merged
merged 195 commits into from
Dec 6, 2024
Merged

[Release] 2.5.23 #249

merged 195 commits into from
Dec 6, 2024

Conversation

lmcmz
Copy link
Member

@lmcmz lmcmz commented Dec 6, 2024

Release 2.5.23

zzggo and others added 30 commits September 30, 2024 22:12
# Conflicts:
#	src/ui/utils/modules/findAddressWithPK.tsx
#	src/ui/views/Dashboard/Components/MenuDrawer.tsx
# Conflicts:
#	src/ui/views/Dashboard/Header.tsx
# Conflicts:
#	src/background/controller/wallet.ts
#	src/background/service/userWallet.ts
#	src/ui/utils/modules/findAddressWithPubKey.tsx
#	src/ui/views/AddWelcome/AddressImport/ImportPager.tsx
#	src/ui/views/AddWelcome/ProxySync/ProxyQr.tsx
#	src/ui/views/AddWelcome/Sync/SyncQr.tsx
#	src/ui/views/AddressImport/ImportPager.tsx
#	src/ui/views/Dashboard/Components/MenuDrawer.tsx
#	src/ui/views/EvmMove/MoveFromChild/index.tsx
#	src/ui/views/EvmMove/MoveFromParent/index.tsx
#	src/ui/views/NFT/index.tsx
#	src/ui/views/Send/SendEth/ToEthConfirmation.tsx
#	src/ui/views/Send/TransferConfirmation.tsx
#	src/ui/views/Setting/Wallet/WalletDetail.tsx
#	src/ui/views/Setting/Wallet/index.tsx
#	src/ui/views/Sync/SyncQr.tsx
#	src/ui/views/Wallet/index.tsx
# Conflicts:
#	src/background/service/openapi.ts
# Conflicts:
#	src/background/controller/wallet.ts
#	src/ui/utils/modules/findAddressWithPubKey.tsx
#	src/ui/views/Dashboard/Components/MenuDrawer.tsx
#	src/ui/views/Dashboard/Header.tsx
#	src/ui/views/NFT/SendNFT/MovefromParent.tsx
#	src/ui/views/NFT/SendNFT/SendNFTConfirmation.tsx
#	src/ui/views/Send/SendEth/ToEthConfirmation.tsx
#	src/ui/views/Send/TransferConfirmation.tsx
@lmcmz lmcmz requested a review from a team December 6, 2024 07:15
@lmcmz lmcmz changed the title Release 2.5.23 [Release] 2.5.23 Dec 6, 2024
@lmcmz lmcmz merged commit b3fff40 into master Dec 6, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants