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

Indexeraddress #219

Merged
merged 70 commits into from
Dec 6, 2024
Merged

Indexeraddress #219

merged 70 commits into from
Dec 6, 2024

Conversation

zzggo
Copy link
Member

@zzggo zzggo commented Nov 26, 2024

No description provided.

# 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
# Conflicts:
#	src/ui/views/Dashboard/Header.tsx
# Conflicts:
#	src/ui/views/EvmMove/MoveFromChild/index.tsx
#	src/ui/views/EvmMove/MoveFromParent/index.tsx
# Conflicts:
#	src/ui/views/Approval/components/EthApproval/EthMove/AccountBox.tsx
#	src/ui/views/Approval/components/EthApproval/EthMove/index.tsx
# Conflicts:
#	src/ui/FRWComponent/FRWChildProfile.tsx
#	src/ui/FRWComponent/FRWDropdownProfileCard.tsx
#	src/ui/FRWComponent/FRWProfile.tsx
#	src/ui/FRWComponent/FRWProfileCard.tsx
#	src/ui/FRWComponent/FWDropDownProfile.tsx
#	src/ui/FRWComponent/FWMoveDropdown.tsx
#	src/ui/FRWComponent/LLProfile.tsx
#	src/ui/views/Dashboard/Header.tsx
#	src/ui/views/EvmMove/MoveFromParent/index.tsx
#	src/ui/views/Forgot/Recover/index.tsx
#	src/ui/views/Forgot/Reset/index.tsx
#	src/ui/views/Send/AccountsList.tsx
#	src/ui/views/Setting/Wallet/WalletDetail.tsx
@zzggo zzggo requested a review from lmcmz December 6, 2024 02:36
@zzggo zzggo marked this pull request as ready for review December 6, 2024 02:36
@zzggo zzggo merged commit e6da66f into dev Dec 6, 2024
2 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.

2 participants