Tags: p2p-org/key-app-android
Tags
Merge branch 'main' into release/v2.8.0 # Conflicts: # app/build.gradle.kts # app/src/main/java/org/p2p/wallet/AppModule.kt # app/src/main/java/org/p2p/wallet/alarmlogger/model/AlarmSendErrorConverter.kt # app/src/main/java/org/p2p/wallet/alarmlogger/model/AlarmSwapErrorConverter.kt # app/src/main/java/org/p2p/wallet/auth/AuthModule.kt # app/src/main/java/org/p2p/wallet/auth/gateway/GatewayServiceModule.kt # app/src/main/java/org/p2p/wallet/auth/gateway/api/request/UpdateMetadataRpcRequest.kt # app/src/main/java/org/p2p/wallet/auth/gateway/parser/CountryCodeHelper.kt # app/src/main/java/org/p2p/wallet/auth/gateway/repository/GatewayServiceRemoteRepository.kt # app/src/main/java/org/p2p/wallet/auth/gateway/repository/mapper/GatewayServiceCreateWalletMapper.kt # app/src/main/java/org/p2p/wallet/auth/gateway/repository/mapper/GatewayServiceUpdateMetadataMapper.kt # app/src/main/java/org/p2p/wallet/auth/interactor/MetadataInteractor.kt # app/src/main/java/org/p2p/wallet/auth/interactor/restore/RestoreWalletInteractor.kt # app/src/main/java/org/p2p/wallet/auth/repository/CountryCodeInMemoryRepository.kt # app/src/main/java/org/p2p/wallet/auth/ui/phone/PhoneNumberEnterPresenter.kt # app/src/main/java/org/p2p/wallet/auth/ui/phone/countrypicker/CountryCodePickerFragment.kt # app/src/main/java/org/p2p/wallet/auth/ui/phone/countrypicker/CountryCodePickerPresenter.kt # app/src/main/java/org/p2p/wallet/auth/ui/smsinput/NewSmsInputContract.kt # app/src/main/java/org/p2p/wallet/auth/ui/smsinput/NewSmsInputFragment.kt # app/src/main/java/org/p2p/wallet/auth/ui/smsinput/SmsInputTimer.kt # app/src/main/java/org/p2p/wallet/auth/widget/AnimatedSearchView.kt # app/src/main/java/org/p2p/wallet/home/ui/main/HomeFragment.kt # app/src/main/java/org/p2p/wallet/infrastructure/network/interceptor/StrigaHeaderSignatureGenerator.kt # app/src/main/java/org/p2p/wallet/infrastructure/network/provider/TokenKeyProvider.kt # app/src/main/java/org/p2p/wallet/smsinput/SmsInputFactory.kt # app/src/main/java/org/p2p/wallet/smsinput/onboarding/OnboardingSmsInputFragment.kt # app/src/main/java/org/p2p/wallet/striga/StrigaModule.kt # app/src/main/java/org/p2p/wallet/striga/StrigaUserIdProvider.kt # app/src/main/java/org/p2p/wallet/striga/di/StrigaSignupModule.kt # app/src/main/java/org/p2p/wallet/striga/finish/StrigaSignupFinishFragment.kt # app/src/main/java/org/p2p/wallet/striga/model/StrigaApiError.kt # app/src/main/java/org/p2p/wallet/striga/model/StrigaDataLayerError.kt # app/src/main/java/org/p2p/wallet/striga/model/StrigaDataLayerHttpErrorParser.kt # app/src/main/java/org/p2p/wallet/striga/model/StrigaDataLayerResult.kt # app/src/main/java/org/p2p/wallet/striga/onboarding/StrigaOnboardingContract.kt # app/src/main/java/org/p2p/wallet/striga/onboarding/StrigaOnboardingFragment.kt # app/src/main/java/org/p2p/wallet/striga/onboarding/StrigaOnboardingPresenter.kt # app/src/main/java/org/p2p/wallet/striga/onboarding/interactor/StrigaOnboardingInteractor.kt # app/src/main/java/org/p2p/wallet/striga/presetpicker/StrigaPresetDataPickerContract.kt # app/src/main/java/org/p2p/wallet/striga/presetpicker/StrigaPresetDataPickerFragment.kt # app/src/main/java/org/p2p/wallet/striga/signup/StrigaPresetDataInMemoryRepository.kt # app/src/main/java/org/p2p/wallet/striga/signup/StrigaPresetDataLocalRepository.kt # app/src/main/java/org/p2p/wallet/striga/signup/dao/StrigaSignupDataEntity.kt # app/src/main/java/org/p2p/wallet/striga/signup/repository/StrigaSignupDataDatabaseRepository.kt # app/src/main/java/org/p2p/wallet/striga/signup/repository/StrigaSignupDataLocalRepository.kt # app/src/main/java/org/p2p/wallet/striga/signup/repository/mapper/StrigaSignupDataMapper.kt # app/src/main/java/org/p2p/wallet/striga/signup/repository/model/StrigaSignupDataType.kt # app/src/main/java/org/p2p/wallet/striga/sms/signup/StrigaSignupSmsInputFragment.kt # app/src/main/java/org/p2p/wallet/striga/ui/TopUpWalletBottomSheet.kt # app/src/main/java/org/p2p/wallet/striga/user/api/StrigaApi.kt # app/src/main/java/org/p2p/wallet/striga/user/api/request/StrigaVerifyMobileNumberRequest.kt # app/src/main/java/org/p2p/wallet/striga/user/api/response/StrigaUserDetailsResponse.kt # app/src/main/java/org/p2p/wallet/striga/user/model/StrigaUserDetails.kt # app/src/main/java/org/p2p/wallet/striga/user/model/StrigaUserVerificationStatus.kt # app/src/main/java/org/p2p/wallet/striga/user/repository/StrigaUserRemoteRepository.kt # app/src/main/java/org/p2p/wallet/striga/user/repository/StrigaUserRepository.kt # app/src/main/java/org/p2p/wallet/striga/user/repository/StrigaUserRepositoryMapper.kt # app/src/main/java/org/p2p/wallet/utils/NetworkExtensions.kt # app/src/main/res/drawable/list_divider_smoke.xml # app/src/main/res/layout/dialog_topup_wallet.xml # app/src/main/res/layout/fragment_new_sms_input.xml # app/src/main/res/layout/fragment_striga_onboarding.xml # app/src/main/res/layout/fragment_striga_preset_data_picker.xml # app/src/main/res/layout/fragment_striga_sign_up_first_step.xml # app/src/main/res/layout/fragment_striga_sign_up_second_step.xml # app/src/main/res/layout/fragment_striga_signup_finish.xml # app/src/main/res/raw/striga_occupation_values.json # app/src/main/res/raw/striga_source_of_funds_values.json # app/src/main/res/values/striga_strings.xml # app/src/main/res/values/striga_tags.xml # app/src/test/java/org/p2p/wallet/auth/interactor/GatewayMetadataMergerTest.kt # app/src/test/java/org/p2p/wallet/infrastructure/network/interceptor/StrigaHeaderSignatureGeneratorTest.kt # app/src/test/java/org/p2p/wallet/smsinput/SmsInputFactoryTest.kt # app/src/test/java/org/p2p/wallet/striga/model/StrigaDataLayerHttpError400And409ParserTest.kt # app/src/test/java/org/p2p/wallet/striga/onboarding/StrigaOnboardingPresenterTest.kt # app/src/test/java/org/p2p/wallet/striga/repository/StrigaKycDataInMemoryRepositoryTest.kt # app/src/test/java/org/p2p/wallet/utils/TestUtils.kt # app/src/test/resources/striga_occupation_values.json # buildSrc/src/main/java/AppVersions.kt # buildSrc/src/main/java/LastCommit.kt # core/src/main/java/org/p2p/core/crypto/Base58String.kt # core/src/main/java/org/p2p/core/network/environment/GatewayServiceEnvironment.kt # core/src/main/java/org/p2p/core/network/environment/NetworkServicesUrlProvider.kt # core/src/main/java/org/p2p/core/network/interceptor/RpcInterceptor.kt # core/src/main/java/org/p2p/core/utils/StdExtensions.kt # core/src/main/res/values/environment_config.xml # ui-kit/src/main/kotlin/org/p2p/uikit/components/UiKitEditText.kt # ui-kit/src/main/kotlin/org/p2p/uikit/utils/SpanUtils.kt # ui-kit/src/main/res/layout/widget_icon_wrapper_single.xml # ui-kit/src/main/res/layout/widget_ui_kit_edittext.xml # ui-kit/src/main/res/values/attrs.xml
Merge branch 'main' into release/2.6.0 # Conflicts: # app/src/main/java/org/p2p/wallet/home/ui/main/HomePresenter.kt # app/src/main/java/org/p2p/wallet/home/ui/main/UserTokensPolling.kt # app/src/main/java/org/p2p/wallet/infrastructure/db/WalletDatabase.kt # app/src/main/java/org/p2p/wallet/jupiter/JupiterModule.kt # app/src/main/java/org/p2p/wallet/jupiter/ui/settings/presenter/JupiterSwapFeeBuilder.kt # app/src/main/java/org/p2p/wallet/jupiter/ui/settings/presenter/SwapContentSettingsMapper.kt # app/src/main/java/org/p2p/wallet/newsend/ui/vialink/SendViaLinkPresenter.kt # app/src/main/java/org/p2p/wallet/user/interactor/UserInteractor.kt # app/src/main/java/org/p2p/wallet/user/repository/UserRemoteRepository.kt # app/src/main/java/org/p2p/wallet/user/repository/UserRepository.kt # buildSrc/src/main/java/AppVersions.kt # core/src/main/java/org/p2p/core/token/Token.kt
PreviousNext