6ce230cba0
# Conflicts: # configuration-api-lib/src/commonMain/kotlin/co/electriccoin/zcash/configuration/api/MergingConfigurationProvider.kt # sdk-ext-lib/src/main/java/cash/z/ecc/sdk/model/SeedPhraseValidation.kt # ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/TextField.kt # ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/account/view/AccountViewTest.kt # ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/balances/view/BalancesViewTest.kt # ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreViewTest.kt # ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/securitywarning/view/SecurityWarningViewTestSetup.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/NavigationRouter.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/common/compose/SynchronizationStatus.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/common/repository/ExchangeRateRepository.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/common/repository/MetadataRepository.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/common/repository/WalletRepository.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/common/usecase/GetCurrentFilteredTransactionsUseCase.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/common/usecase/GetTransactionDetailByIdUseCase.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/common/usecase/GetWalletAccountsUseCase.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/common/usecase/Zip321ParseUriValidationUseCase.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/common/viewmodel/WalletViewModel.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/account/AndroidAccount.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/account/view/AccountView.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/accountlist/viewmodel/AccountListViewModel.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/advancedsettings/AndroidAdvancedSettings.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/authentication/AndroidAuthentication.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/balances/AndroidBalances.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/balances/model/WalletDisplayValues.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/balances/view/BalancesView.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/AndroidHome.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/view/HomeView.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/integrations/AndroidIntegrations.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/integrations/viewmodel/IntegrationsViewModel.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/AndroidRestore.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/model/ParseResult.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/state/RestoreState.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/state/WordList.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreView.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/viewmodel/RestoreViewModel.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/scan/AndroidScan.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/scan/model/ScanResultState.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/securitywarning/AndroidSecurityWarning.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/securitywarning/view/SecurityWarningView.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/seed/SeedRecoveryView.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/transactiondetail/TransactionDetailViewModel.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/transactionfilters/viewmodel/TransactionFiltersViewModel.kt # ui-screenshot-test/src/main/java/co/electroniccoin/zcash/ui/screenshot/ScreenshotTest.kt |
||
|---|---|---|
| .. | ||
| src | ||
| build.gradle.kts | ||
| gradle.lockfile | ||