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

Feature/fw adoptation #1292

Open
wants to merge 164 commits into
base: develop
Choose a base branch
from
Open

Feature/fw adoptation #1292

wants to merge 164 commits into from

Conversation

bnsports
Copy link
Contributor

No description provided.

Radmir Dzhurabaev added 30 commits August 8, 2024 10:03
# Conflicts:
#	fearless.xcodeproj/project.pbxproj
#	fearless.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	fearless/ApplicationLayer/Services/Balance/EthereumRemoteBalanceFetching.swift
#	fearless/ApplicationLayer/Services/SearchService.swift
#	fearless/ApplicationLayer/StakingRewards/StakingRewardsFetcherAssembly.swift
#	fearless/Common/DataProvider/PriceProviderFactory.swift
#	fearless/Common/DataProvider/Sources/PriceDataSource.swift
#	fearless/Common/DataProvider/Subscription/PriceLocalStorageSubscriber.swift
#	fearless/Common/Extension/Wallet/SearchData+Contacts.swift
#	fearless/Common/Extension/Wallet/TransactionHistoryItem+Extrinsic.swift
#	fearless/Common/Helpers/AddressConversion.swift
#	fearless/Common/Services/WebSocketService/StorageSubscription/TransactionSubscription.swift
#	fearless/Common/Storage/EntityToModel/MetaAccountMapper.swift
#	fearless/CoreLayer/OperationFactory/BlockExplorer/History/Main/HistoryOperationFactory.swift
#	fearless/CoreLayer/OperationFactory/BlockExplorer/History/Staking/ParachainHistoryOperationFactory.swift
#	fearless/CoreLayer/OperationFactory/BlockExplorer/Rewards/RewardOperationFactory.swift
#	fearless/Modules/BackupWallet/BackupWalletAssembly.swift
#	fearless/Modules/BackupWallet/BackupWalletViewModelFactory.swift
#	fearless/Modules/CrossChain/CrossChainViewController.swift
#	fearless/Modules/LiquidityPools/LiquidityPoolDetails/Resources/chains.json
#	fearless/Modules/NFT/NftSend/NftSendAssembly.swift
#	fearless/Modules/NewWallet/ChainAssetList/ChainAssetListAssembly.swift
#	fearless/Modules/NewWallet/ChainAssetList/ChainAssetListInteractor.swift
#	fearless/Modules/SelectExportAccount/SelectExportAccountRouter.swift
#	fearless/Modules/Send/SendAssembly.swift
#	fearless/Modules/Send/SendDependencyContainer.swift
#	fearless/Modules/Send/SendInteractor.swift
#	fearless/Modules/Send/SendPresenter.swift
#	fearless/Modules/Send/SendProtocols.swift
#	fearless/Modules/Send/ViewModel/SendViewModelFactory.swift
#	fearless/Modules/Staking/StakingMain/Flow/Relaychain/StakingMainRelaychainStrategy.swift
#	fearless/Modules/Transfer/Transfer/SendViewLayout.swift
#	fearless/Modules/Transfer/Transfer/TransferViewController.swift
#	fearless/Modules/WalletMainContainer/ViewModel/WalletMainContainerViewModelFactory.swift
#	fearless/Modules/WalletMainContainer/WalletMainContainerAssembly.swift
#	fearless/Modules/WalletMainContainer/WalletMainContainerInteractor.swift
#	fearless/Modules/WalletMainContainer/WalletMainContainerPresenter.swift
#	fearless/Modules/WalletMainContainer/WalletMainContainerRouter.swift
…e/fw-adoptation

# Conflicts:
#	fearless.xcodeproj/project.pbxproj
#	fearless.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	fearless/Common/Storage/EntityToModel/ChainModelMapper.swift
#	fearless/Common/Storage/SubstrateDataModel.xcdatamodeld/SubstrateDataModel_v8.xcdatamodel/contents
#	fearless/Modules/NewWallet/ChainAssetList/ChainAssetListAssembly.swift
#	fearless/Modules/NewWallet/ChainAssetList/ChainAssetListInteractor.swift
#	fearless/Modules/NewWallet/WalletSendConfirm/WalletSendConfirmInteractor.swift
#	fearless/Modules/NewWallet/WalletSendConfirm/WalletSendConfirmPresenter.swift
#	fearless/Modules/NewWallet/WalletSendConfirm/WalletSendConfirmProtocols.swift
#	fearless/Modules/NewWallet/WalletSendConfirm/WalletSendConfirmViewFactory.swift
#	fearless/Modules/Send/SendAssembly.swift
#	fearless/Modules/Send/SendInteractor.swift
#	fearless/Modules/Send/SendPresenter.swift
#	fearless/Modules/Send/SendProtocols.swift
…e/fw-adoptation

# Conflicts:
#	fearless.xcodeproj/project.pbxproj
#	fearless.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	fearless/Common/Helpers/AssetModelMapper.swift
#	fearless/Common/Helpers/WalletAssetsObserver.swift
#	fearless/Common/Storage/EntityToModel/ChainModelMapper.swift
#	fearless/Common/Storage/SubstrateDataModel.xcdatamodeld/SubstrateDataModel_v8.xcdatamodel/contents
#	fearless/Modules/NewWallet/ChainAssetList/ChainAssetListInteractor.swift
Viscount88
Viscount88 previously approved these changes Feb 21, 2025
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