Release/v2.12.0 to main

.github/CODEOWNERS

@@ -3,4 +3,4 @@
 # In this example, those users owns any file in an checking directory
 # anywhere in your repository.
 
-*   @1sakov @Davran331122 @kabramovp2p @gslevinkov @eduardmaximovich
+*   @gslevinkov @eduardmaximovich

app/src/main/AndroidManifest.xml

@@ -18,6 +18,7 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
 
     <application

app/src/main/assets/referral_bridge_provider.js

@@ -0,0 +1,31 @@
+
+// we need this JS code to inject the ReferralBridge object into the global namespace
+// and parse the result data into a JSON object instead of raw string
+window.ReferralBridge = {
+    getUserPublicKeyAsync: async function() {
+        const result = await AndroidReferralBridge.getUserPublicKeyAsync();
+        return JSON.parse(result)
+    },
+    nativeLog: function(info) {
+        AndroidReferralBridge.nativeLog(info);
+    },
+    showShareDialog: function(link) {
+        AndroidReferralBridge.showShareDialog(link);
+    },
+    openTermsUrl: function(link) {
+        AndroidReferralBridge.openTermsUrl(link);
+    },
+    navigateToSwap: function() {
+        AndroidReferralBridge.navigateToSwap();
+    },
+    reloadPage: function() {
+        AndroidReferralBridge.reloadPage();
+    },
+    getClipboardContent: function() {
+        return JSON.parse(AndroidReferralBridge.getClipboardValue());
+    },
+    signMessageAsync: async function(message) {
+        const result = AndroidReferralBridge.signMessageAsync(message);
+        return JSON.parse(result)
+    }
+}

app/src/main/java/org/p2p/wallet/App.kt

@@ -31,6 +31,10 @@ import org.p2p.wallet.utils.SolanajTimberLogger
 import org.p2p.core.BuildConfig as CoreBuildConfig
 import org.p2p.wallet.BuildConfig as AppBuildConfig
 
+@Suppress("KotlinConstantConditions")
+val isLocalDebugBuild: Boolean
+    get() = AppBuildConfig.DEBUG && AppBuildConfig.BUILD_TYPE == "debug"
+
 class App : Application(), Configuration.Provider {
     private val crashLoggerInitializer: CrashLoggerInitializer by inject()
     private val crashLogger: CrashLogger by inject()

app/src/main/java/org/p2p/wallet/alarmlogger/logger/AlarmErrorsLogger.kt

@@ -176,8 +176,8 @@ class AlarmErrorsLogger(
         error: Throwable,
         noinline requestProvider: suspend T.() -> AlarmErrorsRequest,
     ) {
-        val isErrorShouldBeLogged = error is CancellationException || error.cause is CancellationException
-        if (!isLoggerEnabled || !isErrorShouldBeLogged) return
+        val isFilteredError = error is CancellationException || error.cause is CancellationException
+        if (!isLoggerEnabled || isFilteredError) return
 
         appScope.launch {
             try {

app/src/main/java/org/p2p/wallet/auth/interactor/UsernameInteractor.kt

@@ -5,18 +5,18 @@ import android.content.SharedPreferences
 import android.graphics.Bitmap
 import timber.log.Timber
 import java.io.File
+import org.p2p.core.crashlytics.CrashLogger
+import org.p2p.core.crypto.Base58String
+import org.p2p.core.crypto.toBase58Instance
 import org.p2p.wallet.auth.model.Username
 import org.p2p.wallet.auth.repository.UserSignUpDetailsStorage
 import org.p2p.wallet.auth.username.repository.UsernameRepository
 import org.p2p.wallet.auth.username.repository.model.UsernameDetails
-import org.p2p.core.crashlytics.CrashLogger
 import org.p2p.wallet.common.feature_toggles.toggles.remote.RegisterUsernameEnabledFeatureToggle
 import org.p2p.wallet.common.feature_toggles.toggles.remote.UsernameDomainFeatureToggle
 import org.p2p.wallet.common.storage.FileRepository
 import org.p2p.wallet.infrastructure.network.provider.TokenKeyProvider
 import org.p2p.wallet.restore.interactor.KEY_IS_AUTH_BY_SEED_PHRASE
-import org.p2p.core.crypto.Base58String
-import org.p2p.core.crypto.toBase58Instance
 
 const val KEY_USERNAME = "KEY_USERNAME"
 const val KEY_USERNAME_DOMAIN = "KEY_USERNAME_DOMAIN"

app/src/main/java/org/p2p/wallet/auth/ui/pin/newcreate/NewCreatePinFragment.kt

@@ -1,27 +1,28 @@
 package org.p2p.wallet.auth.ui.pin.newcreate
 
+import androidx.activity.addCallback
 import android.os.Bundle
 import android.view.View
-import androidx.activity.addCallback
 import org.koin.android.ext.android.inject
+import javax.crypto.Cipher
+import org.p2p.core.analytics.constants.ScreenNames
 import org.p2p.uikit.organisms.UiKitToolbar
 import org.p2p.wallet.R
 import org.p2p.wallet.auth.ui.reserveusername.ReserveUsernameFragment
 import org.p2p.wallet.auth.ui.reserveusername.ReserveUsernameOpenedFrom
-import org.p2p.core.analytics.constants.ScreenNames
 import org.p2p.wallet.common.analytics.interactor.ScreensAnalyticsInteractor
 import org.p2p.wallet.common.mvp.BaseMvpFragment
 import org.p2p.wallet.databinding.FragmentNewCreatePinBinding
 import org.p2p.wallet.home.ui.container.MainContainerFragment
 import org.p2p.wallet.home.ui.main.MainFragmentOnCreateAction
 import org.p2p.wallet.home.ui.main.MainFragmentOnCreateAction.PlayAnimation
 import org.p2p.wallet.intercom.IntercomService
+import org.p2p.wallet.root.RootActivity
 import org.p2p.wallet.utils.BiometricPromptWrapper
 import org.p2p.wallet.utils.popAndReplaceFragment
 import org.p2p.wallet.utils.popBackStack
 import org.p2p.wallet.utils.vibrate
 import org.p2p.wallet.utils.viewbinding.viewBinding
-import javax.crypto.Cipher
 
 private const val VIBRATE_DURATION = 10L
 
@@ -125,6 +126,7 @@ class NewCreatePinFragment :
         } else {
             arrayListOf()
         }
+        (activity as? RootActivity)?.onSignInSuccess()
         popAndReplaceFragment(
             MainContainerFragment.create(actions),
             inclusive = true

app/src/main/java/org/p2p/wallet/auth/ui/pin/signin/SignInPinFragment.kt

@@ -6,17 +6,18 @@ import androidx.appcompat.app.AlertDialog
 import android.os.Bundle
 import android.view.View
 import org.koin.android.ext.android.inject
+import javax.crypto.Cipher
 import org.p2p.wallet.R
 import org.p2p.wallet.auth.ui.onboarding.root.OnboardingRootFragment
 import org.p2p.wallet.common.mvp.BaseMvpFragment
 import org.p2p.wallet.databinding.FragmentSignInPinBinding
 import org.p2p.wallet.home.ui.container.MainContainerFragment
 import org.p2p.wallet.intercom.IntercomService
+import org.p2p.wallet.root.RootActivity
 import org.p2p.wallet.utils.BiometricPromptWrapper
 import org.p2p.wallet.utils.popAndReplaceFragment
 import org.p2p.wallet.utils.vibrate
 import org.p2p.wallet.utils.viewbinding.viewBinding
-import javax.crypto.Cipher
 
 class SignInPinFragment :
     BaseMvpFragment<SignInPinContract.View, SignInPinContract.Presenter>(R.layout.fragment_sign_in_pin),
@@ -74,6 +75,7 @@ class SignInPinFragment :
 
     override fun onSignInSuccess() {
         binding.pinView.onSuccessPin()
+        (activity as? RootActivity)?.onSignInSuccess()
         popAndReplaceFragment(MainContainerFragment.create(), inclusive = true)
     }
 

app/src/main/java/org/p2p/wallet/auth/ui/username/UsernameFragment.kt

@@ -4,22 +4,22 @@ import android.graphics.Bitmap
 import android.os.Bundle
 import android.view.View
 import org.koin.android.ext.android.inject
+import java.io.File
+import org.p2p.core.utils.Constants
 import org.p2p.uikit.utils.SpanUtils.highlightPublicKey
 import org.p2p.uikit.utils.toast
 import org.p2p.wallet.R
 import org.p2p.wallet.auth.model.Username
 import org.p2p.wallet.common.analytics.interactor.ScreensAnalyticsInteractor
 import org.p2p.wallet.databinding.FragmentUsernameBinding
 import org.p2p.wallet.receive.analytics.ReceiveAnalytics
-import org.p2p.wallet.receive.list.TokenListFragment
+import org.p2p.wallet.receive.list.ReceiveTokenListFragment
 import org.p2p.wallet.receive.widget.BaseQrCodeFragment
 import org.p2p.wallet.receive.widget.ReceiveCardView
-import org.p2p.core.utils.Constants
 import org.p2p.wallet.utils.popBackStack
 import org.p2p.wallet.utils.replaceFragment
 import org.p2p.wallet.utils.shareScreenShot
 import org.p2p.wallet.utils.viewbinding.viewBinding
-import java.io.File
 
 class UsernameFragment :
     BaseQrCodeFragment<UsernameContract.View, UsernameContract.Presenter>(R.layout.fragment_username),
@@ -42,7 +42,7 @@ class UsernameFragment :
             toolbar.setNavigationOnClickListener { popBackStack() }
             receiveCardView.initReceiveCardView()
             progressButton.setOnClickListener {
-                replaceFragment(TokenListFragment.create())
+                replaceFragment(ReceiveTokenListFragment.create())
             }
         }
         presenter.loadData()

app/src/main/java/org/p2p/wallet/bridge/interactor/EthereumInteractor.kt

@@ -41,7 +41,7 @@ class EthereumInteractor(
         ethereumRepository.cacheWalletTokens(tokens)
     }
 
-    suspend fun updateTokensRates(tokensRates: List<TokenServicePrice>) {
+    suspend fun saveTokensRates(tokensRates: List<TokenServicePrice>) {
         ethereumRepository.updateTokensRates(tokensRates)
     }
 

app/src/main/java/org/p2p/wallet/bridge/send/SendFragmentFactory.kt

@@ -7,8 +7,25 @@ import org.p2p.wallet.common.feature_toggles.toggles.remote.EthAddressEnabledFea
 import org.p2p.wallet.send.model.NetworkType
 import org.p2p.wallet.send.model.SearchResult
 import org.p2p.wallet.send.ui.NewSendFragment
+import org.p2p.wallet.send.ui.SearchOpenedFromScreen
+import org.p2p.wallet.send.ui.search.NewSearchFragment
+import org.p2p.wallet.send.ui.stub.SendUnavailableFragment
+import org.p2p.wallet.user.interactor.UserInteractor
 
-class SendFragmentFactory(private val ethAddressEnabledFeatureToggle: EthAddressEnabledFeatureToggle) {
+class SendFragmentFactory(
+    private val ethAddressEnabledFeatureToggle: EthAddressEnabledFeatureToggle,
+    private val userInteractor: UserInteractor
+) {
+
+    suspend fun searchFragment(): Fragment? {
+        val isAccountEmpty = userInteractor.getNonZeroUserTokens().isEmpty()
+        return if (isAccountEmpty) {
+            val token = userInteractor.getSingleTokenForBuy() ?: return null
+            SendUnavailableFragment.create(token)
+        } else {
+            NewSearchFragment.create(SearchOpenedFromScreen.MAIN)
+        }
+    }
 
     fun sendFragment(searchResult: SearchResult, initialToken: Token.Active?): Fragment {
         return if (ethAddressEnabledFeatureToggle.isFeatureEnabled &&

app/src/main/java/org/p2p/wallet/bridge/send/ui/BridgeSendPresenter.kt

@@ -11,13 +11,14 @@ import org.p2p.core.common.TextContainer
 import org.p2p.core.common.di.AppScope
 import org.p2p.core.model.CurrencyMode
 import org.p2p.core.token.Token
+import org.p2p.core.utils.SOL_DECIMALS
 import org.p2p.core.utils.asNegativeUsdTransaction
 import org.p2p.core.utils.asUsd
 import org.p2p.core.utils.formatTokenWithSymbol
 import org.p2p.core.utils.isConnectionError
 import org.p2p.core.utils.isZero
 import org.p2p.core.utils.orZero
-import org.p2p.core.utils.scaleShort
+import org.p2p.core.utils.scaleTwo
 import org.p2p.core.utils.toBigDecimalOrZero
 import org.p2p.uikit.utils.text.TextViewCellModel
 import org.p2p.wallet.R
@@ -241,7 +242,7 @@ class BridgeSendPresenter(
             if (calculationMode.getCurrencyMode() is CurrencyMode.Fiat.Usd) {
                 switchCurrencyMode()
             }
-            val newTextValue = inputAmount.scaleShort().toPlainString()
+            val newTextValue = inputAmount.scaleTwo().toPlainString()
             updateInputValue(newTextValue, forced = true)
             calculationMode.updateInputAmount(newTextValue)
             disableInputs()
@@ -300,7 +301,7 @@ class BridgeSendPresenter(
                 }
                 is CurrencyMode.Token -> {
                     val tokenSymbol = mode.symbol
-                    amountPlusTotalFee.formatTokenWithSymbol(tokenSymbol)
+                    amountPlusTotalFee.formatTokenWithSymbol(tokenSymbol, SOL_DECIMALS)
                 }
                 else -> {
                     emptyString()

app/src/main/java/org/p2p/wallet/common/InAppFeatureFlags.kt

@@ -5,6 +5,7 @@ import org.p2p.wallet.common.feature_toggles.toggles.inapp.DebugTogglesFeatureFl
 import org.p2p.wallet.common.feature_toggles.toggles.inapp.DevNetFeatureFlag
 import org.p2p.wallet.common.feature_toggles.toggles.inapp.InAppFeatureFlag
 import org.p2p.wallet.common.feature_toggles.toggles.inapp.PollingFeatureFlag
+import org.p2p.wallet.common.feature_toggles.toggles.inapp.ReferralRewardTxMockFlag
 import org.p2p.wallet.common.feature_toggles.toggles.inapp.StrigaEnableEmailFieldFlag
 import org.p2p.wallet.common.feature_toggles.toggles.inapp.StrigaKycBannerMockFlag
 import org.p2p.wallet.common.feature_toggles.toggles.inapp.StrigaSimulateIbanNotFilledFlag
@@ -16,6 +17,7 @@ import org.p2p.wallet.common.feature_toggles.toggles.inapp.StrigaSmsVerification
 class InAppFeatureFlags(prefs: SharedPreferences) {
     val isPollingEnabled = PollingFeatureFlag(prefs)
     var isDevNetEnabled = DevNetFeatureFlag(prefs)
+    val referralRewardTxMockEnabled = ReferralRewardTxMockFlag(prefs)
     val strigaSimulateWeb3Flag = StrigaSimulateWeb3Flag(prefs)
     val strigaSimulateUserCreateFlag = StrigaSimulateUserCreateFlag(prefs)
     val strigaSmsVerificationMockFlag = StrigaSmsVerificationMockFlag(prefs)
@@ -33,6 +35,7 @@ class InAppFeatureFlags(prefs: SharedPreferences) {
         isPollingEnabled,
         isDevNetEnabled,
         isDebugRemoteConfigEnabled,
+        referralRewardTxMockEnabled,
         /*
         strigaSimulateWeb3Flag,
         strigaSimulateUserCreateFlag,

app/src/main/java/org/p2p/wallet/common/feature_toggles/di/FeatureTogglesModule.kt

@@ -12,10 +12,12 @@ import org.p2p.wallet.common.feature_toggles.remote_config.LocalFirebaseRemoteCo
 import org.p2p.wallet.common.feature_toggles.remote_config.RemoteConfigValuesProvider
 import org.p2p.wallet.common.feature_toggles.toggles.FeatureToggleProvider
 import org.p2p.wallet.common.feature_toggles.toggles.remote.EthAddressEnabledFeatureToggle
+import org.p2p.wallet.common.feature_toggles.toggles.remote.ForceUpdateVersionCodeFeatureToggle
 import org.p2p.wallet.common.feature_toggles.toggles.remote.NetworkObservationDebounceFeatureToggle
 import org.p2p.wallet.common.feature_toggles.toggles.remote.NetworkObservationFeatureToggle
 import org.p2p.wallet.common.feature_toggles.toggles.remote.NetworkObservationFrequencyFeatureToggle
 import org.p2p.wallet.common.feature_toggles.toggles.remote.NetworkObservationPercentFeatureToggle
+import org.p2p.wallet.common.feature_toggles.toggles.remote.PnlEnabledFeatureToggle
 import org.p2p.wallet.common.feature_toggles.toggles.remote.ReferralProgramEnabledFeatureToggle
 import org.p2p.wallet.common.feature_toggles.toggles.remote.RegisterUsernameEnabledFeatureToggle
 import org.p2p.wallet.common.feature_toggles.toggles.remote.RegisterUsernameSkipEnabledFeatureToggle
@@ -37,7 +39,7 @@ object FeatureTogglesModule : InjectionModule {
         singleOf(::FeatureTogglesValuesSource) bind RemoteConfigValuesProvider::class
 
         factory {
-            setOf(
+            listOf(
                 get<SslPinningFeatureToggle>(),
                 get<SettingsNetworkListFeatureToggle>(),
                 get<NetworkObservationFeatureToggle>(),
@@ -52,7 +54,9 @@ object FeatureTogglesModule : InjectionModule {
                 get<StrigaSignupEnabledFeatureToggle>(),
                 get<SwapRoutesRefreshFeatureToggle>(),
                 get<ReferralProgramEnabledFeatureToggle>(),
-            ).toList()
+                get<ForceUpdateVersionCodeFeatureToggle>(),
+                get<PnlEnabledFeatureToggle>(),
+            )
         }
 
         factoryOf(::SslPinningFeatureToggle)
@@ -62,6 +66,7 @@ object FeatureTogglesModule : InjectionModule {
         factoryOf(::NetworkObservationPercentFeatureToggle)
         factoryOf(::NetworkObservationFrequencyFeatureToggle)
         factoryOf(::NetworkObservationDebounceFeatureToggle)
+        factoryOf(::ForceUpdateVersionCodeFeatureToggle)
         factoryOf(::UsernameDomainFeatureToggle)
         factoryOf(::RegisterUsernameEnabledFeatureToggle)
         factoryOf(::RegisterUsernameSkipEnabledFeatureToggle)
@@ -72,6 +77,7 @@ object FeatureTogglesModule : InjectionModule {
         factoryOf(::SwapRoutesValidationEnabledFeatureToggle)
         factoryOf(::StrigaSignupEnabledFeatureToggle)
         factoryOf(::ReferralProgramEnabledFeatureToggle)
+        factoryOf(::PnlEnabledFeatureToggle)
 
         singleOf(::FeatureToggleProvider)
     }

app/src/main/java/org/p2p/wallet/common/feature_toggles/remote_config/AppFirebaseRemoteConfig.kt

@@ -8,8 +8,8 @@ import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
-import org.p2p.wallet.BuildConfig
 import org.p2p.core.common.di.AppScope
+import org.p2p.wallet.BuildConfig
 import org.p2p.wallet.utils.retryOnException
 
 private const val NO_VALUE = ""
@@ -53,7 +53,6 @@ class AppFirebaseRemoteConfig(
             remoteConfig.fetchAndActivate()
                 .addOnSuccessListener {
                     isFetchFailed = false
-
                     Timber.d("Remote config fetched and activated")
                     Timber.i("Remote config fetched toggles: ${allFeatureTogglesRaw()}")
                     continuation.resume(allFeatureTogglesRaw())

app/src/main/java/org/p2p/wallet/common/feature_toggles/toggles/inapp/ReferralRewardTxMockFlag.kt

@@ -0,0 +1,14 @@
+package org.p2p.wallet.common.feature_toggles.toggles.inapp
+
+import android.content.SharedPreferences
+import org.p2p.wallet.common.BooleanPreference
+
+class ReferralRewardTxMockFlag(prefs: SharedPreferences) : InAppFeatureFlag() {
+    private companion object {
+        private const val KEY_FLAG = "KEY_REFERRAL_REWARD_TX_MOCK"
+    }
+    override val featureName: String = KEY_FLAG
+    override var featureValue: Boolean by BooleanPreference(
+        preferences = prefs, key = KEY_FLAG, defaultValue = false
+    )
+}

app/src/main/java/org/p2p/wallet/common/feature_toggles/toggles/remote/ForceUpdateVersionCodeFeatureToggle.kt

@@ -0,0 +1,15 @@
+package org.p2p.wallet.common.feature_toggles.toggles.remote
+
+import org.p2p.wallet.common.feature_toggles.remote_config.RemoteConfigValuesProvider
+
+class ForceUpdateVersionCodeFeatureToggle(
+    valuesProvider: RemoteConfigValuesProvider
+) : LongFeatureToggle(valuesProvider) {
+    companion object {
+        const val NOT_FETCHED = -1L
+    }
+
+    override val featureKey: String = "android_force_update_version_code"
+    override val featureDescription: String = "Version code to force update to"
+    override val defaultValue: Long = NOT_FETCHED
+}

app/src/main/java/org/p2p/wallet/common/feature_toggles/toggles/remote/PnlEnabledFeatureToggle.kt

@@ -0,0 +1,11 @@
+package org.p2p.wallet.common.feature_toggles.toggles.remote
+
+import org.p2p.wallet.common.feature_toggles.remote_config.RemoteConfigValuesProvider
+
+class PnlEnabledFeatureToggle(
+    valuesProvider: RemoteConfigValuesProvider
+) : BooleanFeatureToggle(valuesProvider) {
+    override val featureKey: String = "pnl_enabled"
+    override val featureDescription: String = "Enables PNL calculation"
+    override val defaultValue: Boolean = false
+}