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

Feat/private key import copy #591

Merged
merged 48 commits into from
Dec 9, 2024
Merged

Feat/private key import copy #591

merged 48 commits into from
Dec 9, 2024

Conversation

zhouxl
Copy link
Collaborator

@zhouxl zhouxl commented Nov 26, 2024

No description provided.

zhouxl added 25 commits August 23, 2024 11:32
@zhouxl
feat: keystore first
d577753
@zhouxl
Merge branch 'feature/2.1.12' into feature/2.1.12-multiplekey
ab01b61 
# Conflicts:
#	FRW.xcodeproj/project.pbxproj
#	FRW/Resource/en.lproj/Localizable.strings
@zhouxl
feat: reconstruct with FlowWalletKit
c310ea9
@zhouxl
feat: update Flow Wallet SDK
fa4b7da
@zhouxl
Merge branch 'feature/2.1.12-multiplekey' into feature/2.1.13
8518965 
# Conflicts:
#	FRW.xcodeproj/project.pbxproj
@zhouxl
feat: update import key store logic
df72ca8
@zhouxl
feat： update logic of import key
45f4b4e
@zhouxl
feat: seed phrase import
ca5eaa2
@zhouxl
feat: udpate app version
b84c1db
@zhouxl
feat: change flowdiver to flowscan and open with inapp browser
efdebe6
@zhouxl
feat： update import UI
0bc7eeb
@zhouxl
fix: update foreground color of copy on receive page
e1c856f
@zhouxl
feat: change flowdiver to flowscan
801c9db
@zhouxl
feat: import by seed phrase with name
5108e0d
@zhouxl
Merge branch 'develop' into feat/private-key-import
43a2782 
# Conflicts:
#	FRW.xcodeproj/project.pbxproj
#	FRW/App/AppDelegate.swift
#	FRW/App/Env/Prod/Info.plist
#	FRW/Modules/Login/RestoreWalletView.swift
#	FRW/Modules/MultiBackup/Manager/MultiBackupManager.swift
#	FRW/Modules/MultiBackup/View/BackupUploadView.swift
#	FRW/Modules/MultiBackup/ViewModel/BackupUploadViewModel.swift
#	FRW/Modules/Profile/DeveloperMode/DeveloperModeView.swift
#	FRW/Modules/Register/ViewModel/UsernameViewModel.swift
#	FRW/Modules/Wallet/MoveAsset/ViewModel/MoveSingleNFTViewModel.swift
#	FRW/Resource/en.lproj/Localizable.strings
#	FRW/Services/Manager/LocalUserDefaults.swift
#	FRW/Services/Manager/TransactionManager.swift
#	FRW/Services/Manager/UserManager.swift
#	FRW/Services/Manager/WalletConnect/WalletConnect+SyncDevice.swift
#	FRW/Services/Manager/WalletManager.swift
#	FRW/Services/Router/RouteMap.swift
#	FRW/UI/Extension/String.swift
@zhouxl
feat: format code
4b6b064
@zhouxl
feat: update close icon
39322c0
@zhouxl
feat: udpate close icon
6df0bf0
@zhouxl
Merge branch 'develop' into feat/private-key-import
c168eab 
# Conflicts:
#	FRW/Modules/Browser/BrowserViewController.swift
#	FRW/Modules/Login/RestoreWalletView.swift
#	FRW/Modules/Migration/Migration.swift
#	FRW/Modules/MultiBackup/Manager/MultiBackupManager.swift
#	FRW/Modules/MultiBackup/View/RecoveryPhraseBackupResultView.swift
#	FRW/Modules/MultiBackup/View/ShowRecoveryPhraseBackup.swift
#	FRW/Modules/MultiRestore/ViewModel/RestoreMultiAccountViewModel.swift
#	FRW/Modules/NFT/NFTDetailPage.swift
#	FRW/Modules/Profile/DeveloperMode/KeychainListViewModel.swift
#	FRW/Modules/TrustProvider/TrustJSMessageHandler.swift
#	FRW/Modules/Wallet/AddToken/AddTokenViewModel.swift
#	FRW/Modules/Wallet/Card/CardBackground.swift
#	FRW/Modules/Wallet/CustomToken/AddTokenSheetView.swift
#	FRW/Modules/Wallet/CustomToken/CustomTokenManager.swift
#	FRW/Modules/Wallet/MoveAsset/MoveAccountsView.swift
#	FRW/Modules/Wallet/MoveAsset/ViewModel/MoveTokenViewModel.swift
#	FRW/Modules/Wallet/Send/WalletSendViewModel.swift
#	FRW/Modules/Wallet/WalletViewModel.swift
#	FRW/Services/Cache/CoinRateCache.swift
#	FRW/Services/FlowCoin/CadenceManager.swift
#	FRW/Services/Manager/Backup/Target/BackupGDTarget.swift
#	FRW/Services/Manager/ChildAccountAccessibleManager.swift
#	FRW/Services/Manager/LocalUserDefaults.swift
#	FRW/Services/Manager/UserManager.swift
#	FRW/Services/Manager/WalletConnect/WalletConnectFlowHandler.swift
#	FRW/Services/Manager/WalletManager.swift
#	FRW/Services/Network/FlowNetwork.swift
#	FRW/Services/Track/EventTrack+Transaction.swift
#	FRW/Services/Track/EventTrackName.swift
#	FRW/Tools/ThirdParty/FluidGradient/BlobLayer.swift
#	FRW/Tools/ThirdParty/FluidGradient/FluidGradient.swift
#	FRW/Tools/ThirdParty/FluidGradient/FluidGradientView.swift
#	FRW/Tools/ThirdParty/FluidGradient/ResizableLayer.swift
#	FRW/Tools/ThirdParty/PopupView/PopupViewUtils.swift
#	FRW/Tools/ThirdParty/ProgressHUD/ProgressHUD.swift
#	FRW/Tools/ThirdParty/SPQRCode/Interface/SPQRCameraController.swift
#	FRW/Tools/ThirdParty/SPQRCode/Interface/SPQRMaskView.swift
#	FRW/UI/Component/SectionItem.swift
#	FRW/UI/Extension/Others.swift
@zhouxl
feat: swiftformat
99cc1af
@zhouxl
feat: format
243d1ad
@zhouxl
code format 2
c797a10
@zhouxl
feat: update key
581c280
@zhouxl
Merge branch 'develop' into feat/private-key-import-copy
c37a568 
# Conflicts:
#	FRW.xcodeproj/project.pbxproj
#	FRW/App/AppDelegate.swift
#	FRW/Modules/Backup/ViewModel/ManualBackupViewModel.swift
#	FRW/Modules/ChildAccount/ChildAccountLinkViewModel.swift
#	FRW/Modules/Domain/ClaimDomainViewModel.swift
#	FRW/Modules/EVM/ViewModel/EVMEnableViewModel.swift
#	FRW/Modules/Explore/ViewModel/ExploreTabViewModel.swift
#	FRW/Modules/Inbox/InboxViewModel.swift
#	FRW/Modules/Login/ViewModel/SyncConfirmViewModel.swift
#	FRW/Modules/MultiBackup/Manager/Target/MultiBackupGoogleDriveTarget.swift
#	FRW/Modules/MultiBackup/Manager/Target/MultiBackupiCloudTarget.swift
#	FRW/Modules/MultiBackup/View/BackupUploadView.swift
#	FRW/Modules/MultiBackup/View/IntroductionView.swift
#	FRW/Modules/MultiBackup/ViewModel/MultiBackupDetailViewModel.swift
#	FRW/Modules/NFT/UIKit/NFTUIKitListDataSource.swift
#	FRW/Modules/NFT/UIKit/View/Collection/NFTUIKitCollectionHContainerView.swift
#	FRW/Modules/NFT/UIKit/View/Fav/NFTUIKitFavContainerView.swift
#	FRW/Modules/Profile/AddressBook/Add/AddAddressViewModel.swift
#	FRW/Modules/Profile/AddressBook/AddressBookView.swift
#	FRW/Modules/Profile/AddressBook/AddressBookViewModel.swift
#	FRW/Modules/Profile/Devices/DevicesInfoViewModel.swift
#	FRW/Modules/Secure/ViewModel/VerifyPinViewModel.swift
#	FRW/Modules/Staking/StakeAmount/StakeAmountViewModel.swift
#	FRW/Modules/Staking/StakingDetail/StakingDetailViewModel.swift
#	FRW/Modules/Swap/SwapViewModel.swift
#	FRW/Modules/Transaction/TransactionHolderView.swift
#	FRW/Modules/Transaction/TransactionListView.swift
#	FRW/Modules/TransactionList/View/FlowTransactionViewMoreFooter.swift
#	FRW/Modules/TrustProvider/TrustProvider.swift
#	FRW/Modules/Wallet/AddToken/AddTokenView.swift
#	FRW/Modules/Wallet/Send/WalletSendAmountView.swift
#	FRW/Modules/Wallet/WalletView.swift
#	FRW/SDK/WallectSecureEnclaveStore.swift
#	FRW/Services/Cache/CurrencyCache.swift
#	FRW/Services/Cache/NFTUIKitCache.swift
#	FRW/Services/FlowCoin/FlowAddressRegistor.swift
#	FRW/Services/Manager/Backup/BackupManager.swift
#	FRW/Services/Manager/Backup/Helper/GoogleDriveAPI.swift
#	FRW/Services/Manager/Backup/Helper/iCloudAPI.swift
#	FRW/Services/Manager/Backup/Target/BackupiCloudTarget.swift
#	FRW/Services/Manager/BalanceProvider.swift
#	FRW/Services/Manager/EVMAccountManager.swift
#	FRW/Services/Manager/PushHandler.swift
#	FRW/Services/Manager/StakingManager.swift
#	FRW/Services/Manager/TransactionManager.swift
#	FRW/Services/Manager/WalletConnect/WalletConnect+SyncDevice.swift
#	FRW/Services/Manager/WalletConnect/WalletConnectChildHandlerProtocol.swift
#	FRW/Services/Network/AlchemyEndpoint.swift
#	FRW/Services/Network/FRW/FRWAPI+User.swift
#	FRW/Services/Network/FRW/Model/Request/UserRequests.swift
#	FRW/Services/Network/FRW/Model/Response/FlownsResponses.swift
#	FRW/Services/Network/FRW/Model/Response/NFTListResponse.swift
#	FRW/Services/Network/FRW/Model/Response/OtherResponses.swift
#	FRW/Tools/ThirdParty/PopupView/FullscreenPopup.swift
#	FRW/Tools/ThirdParty/PopupView/PopupView.swift
#	FRW/Tools/ThreadSafeDictionary.swift
#	FRW/UI/Animation/LottieButton.swift
#	FRW/UI/Component/PresentHostingController.swift
#	FRW/UI/UIKit/DOFavoriteButton.swift
#	FRWNotificationServiceExtension/NotificationService.swift
#	FRWTests/FlowReferenceWalletTests.swift
#	FRWWidgets/FlowReferenceWalletWidgets.swift
@zhouxl
feat: remove some comments
7595b22
@gitguardian GitGuardian
Copy link

gitguardian bot commented Nov 26, 2024 •
edited
Loading

⚠️ GitGuardian has uncovered 2 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request
GitGuardian id GitGuardian status Secret Commit Filename
9474120 Triggered Generic Password ab01b61 FRW/Modules/MultiRestore/ViewModel/RestoreMultiConnectViewModel.swift View secret
9474120 Triggered Generic Password ab01b61 FRW/Modules/MultiRestore/ViewModel/RestoreMultiConnectViewModel.swift View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secrets safely. Learn here the best practices.
  3. Revoke and rotate these secrets.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider

🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

@zhouxl zhouxl requested review from lmcmz and jeden November 26, 2024 13:18
@zhouxl zhouxl linked an issue Nov 29, 2024 that may be closed by this pull request
[TESTING] IOS private key function #594
Closed
18 tasks
zhouxl added 15 commits December 4, 2024 17:56
@zhouxl
feat: add tag final for class
73b49f9
@zhouxl
Merge branch 'develop' into feat/private-key-import-copy
6e8fa55 
# Conflicts:
#	FRW.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	FRW/Modules/MultiBackup/ViewModel/BackupUploadViewModel.swift
#	FRW/Services/FlowCoin/CadenceManager.swift
#	FRW/Services/Manager/UserManager.swift
@zhouxl
feat: update version
93112aa
@zhouxl
fix: store all info of seed phrase
74534ab
@zhouxl
feat: event track for ft/nft transaction
9207849
@zhouxl
feat: update cadence from getDelegatesInfoArray to `getDelegatesInf…
b0893a1 
…oArrayV2`
@zhouxl
feat: UI for keychain list
c55f355
@zhouxl
feat: keychainview Item add delete and copy button
12cd507
@zhouxl
feat: update UI
da3148a
@zhouxl
feat: update logic about private key
ef87a57
@zhouxl
feat: update to WalletManager.decryptionChaChaPoly
0afbe11
@zhouxl
fix: remove .key. on key of keychain list
258a1b5
@zhouxl
fix: decode failed
d4f84be
@zhouxl
fix: udpate user with id and public key
1547154
@zhouxl
feat: remove dev tool
71db0e2
@zhouxl
Merge branch 'develop' into feat/private-key-import-copy
a7f20e8 
# Conflicts:
#	FRW.xcodeproj/project.pbxproj
@lmcmz lmcmz dismissed jeden’s stale review December 9, 2024 13:45

Let‘s don't block the feature

@zhouxl zhouxl merged commit 26e4780 into develop Dec 9, 2024
1 check failed
@zhouxl zhouxl deleted the feat/private-key-import-copy branch December 9, 2024 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeden jeden jeden left review comments

@lmcmz lmcmz lmcmz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
Flow Wallet
Status: No status
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[TESTING] IOS private key function
3 participants
@zhouxl @jeden @lmcmz