Merge remote-tracking branch 'origin/master' into feature/trading_perpetual

SeniorZhai · SeniorZhai · commit 2b36e1b38c56 · 2026-03-13T22:48:01.000+08:00
diff --git a/app/src/main/java/one/mixin/android/ui/home/ExploreFragment.kt b/app/src/main/java/one/mixin/android/ui/home/ExploreFragment.kt
@@ -328,7 +328,13 @@ class ExploreFragment : BaseFragment() {
                     DeviceFragment.newInstance().showNow(parentFragmentManager, DeviceFragment.TAG)
                 }
                 INTERNAL_BUY_ID -> {
-                    WalletActivity.showBuy(requireActivity(), false, null, null)
+                    WalletActivity.showBuy(
+                        requireActivity(),
+                        false,
+                        null,
+                        null,
+                        source = AnalyticsTracker.TradeSource.EXPLORE
+                    )
                 }
                 INTERNAL_SWAP_ID -> {
                     AnalyticsTracker.trackTradeStart(TradeWallet.MAIN, AnalyticsTracker.TradeSource.EXPLORE)
@@ -568,4 +574,4 @@ class ExploreFragment : BaseFragment() {
             itemBinding.title.setText(res)
         }
     }
-}
+}
diff --git a/app/src/main/java/one/mixin/android/ui/landing/CreateAccountFragment.kt b/app/src/main/java/one/mixin/android/ui/landing/CreateAccountFragment.kt
@@ -14,7 +14,6 @@ import one.mixin.android.extension.openUrl
 import one.mixin.android.ui.landing.MobileFragment.Companion.FROM_LANDING
 import one.mixin.android.ui.landing.components.CreateAccountPage
 import one.mixin.android.ui.web.WebFragment
-import one.mixin.android.util.analytics.AnalyticsTracker
 import one.mixin.android.util.viewBinding
 import timber.log.Timber
 
@@ -52,16 +51,12 @@ class CreateAccountFragment : Fragment(R.layout.fragment_compose) {
         }
         binding.compose.setContent {
             CreateAccountPage({ create ->
-                if (create) {
-                    AnalyticsTracker.trackSignUpStart("phone_number")
-                }
                 activity?.addFragment(
                     this@CreateAccountFragment,
                     MobileFragment.newInstance(from = FROM_LANDING),
                     MobileFragment.TAG,
                 )
             }, {
-                AnalyticsTracker.trackSignUpStart("mnemonic_phrase")
                 activity?.addFragment(
                     this@CreateAccountFragment,
                     MnemonicPhraseFragment.newInstance(),
diff --git a/app/src/main/java/one/mixin/android/ui/landing/InitializeActivity.kt b/app/src/main/java/one/mixin/android/ui/landing/InitializeActivity.kt
@@ -24,6 +24,7 @@ class InitializeActivity : BaseActivity() {
         val wrongTime = intent.getBooleanExtra(WRONG_TIME, false)
         val oldVersion = intent.getBooleanExtra(OLD_VERSION, false)
         val dbUpgrade = intent.getBooleanExtra(DB_UPGRADE, false)
+        val loadingSource = intent.getStringExtra(LOADING_SOURCE)
         when {
             setName -> replaceFragment(SetupNameFragment.newInstance(), R.id.container)
             setPin -> replaceFragment(SetupPinFragment.newInstance(), R.id.container)
@@ -32,7 +33,7 @@ class InitializeActivity : BaseActivity() {
             dbUpgrade -> replaceFragment(UpgradeFragment.newInstance(TYPE_DB), R.id.container)
             else ->
                 replaceFragment(
-                    LoadingFragment.newInstance(),
+                    LoadingFragment.newInstance(loadingSource),
                     R.id.container,
                     LoadingFragment.TAG,
                 )
@@ -48,6 +49,9 @@ class InitializeActivity : BaseActivity() {
         const val WRONG_TIME = "wrong_time"
         const val OLD_VERSION = "old_version"
         const val DB_UPGRADE = "db_upgrade"
+        const val LOADING_SOURCE = "loading_source"
+        const val SOURCE_SIGN_UP = "sign_up"
+        const val SOURCE_LOGIN = "login"
 
         private fun getIntent(
             context: Context,
@@ -56,13 +60,15 @@ class InitializeActivity : BaseActivity() {
             wrongTime: Boolean = false,
             oldVersion: Boolean = false,
             dbUpgrade: Boolean = false,
+            loadingSource: String? = null,
         ): Intent {
             return Intent(context, InitializeActivity::class.java).apply {
                 this.putExtra(SET_NAME, setName)
                 this.putExtra(SET_PIN, setPin)
                 this.putExtra(WRONG_TIME, wrongTime)
                 this.putExtra(OLD_VERSION, oldVersion)
                 this.putExtra(DB_UPGRADE, dbUpgrade)
+                loadingSource?.let { putExtra(LOADING_SOURCE, it) }
             }
         }
 
@@ -92,12 +98,13 @@ class InitializeActivity : BaseActivity() {
             context: Context,
             load: Boolean = true,
             clear: Boolean = false,
+            source: String? = null,
         ) {
             if (load) {
                 putIsLoaded(context, false)
             }
             context.startActivity(
-                getIntent(context).apply {
+                getIntent(context, loadingSource = source).apply {
                     if (clear) {
                         addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                         addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
diff --git a/app/src/main/java/one/mixin/android/ui/landing/LandingFragment.kt b/app/src/main/java/one/mixin/android/ui/landing/LandingFragment.kt
@@ -170,6 +170,7 @@ class LandingFragment : Fragment(R.layout.fragment_landing) {
 
         binding.version.text = getString(R.string.current_version, BuildConfig.VERSION_NAME)
         binding.createTv.setOnClickListener {
+            AnalyticsTracker.trackSignUpStart()
             CreateAccountConfirmBottomSheetDialogFragment.newInstance()
                 .setOnCreateAccount {
                     activity?.addFragment(
@@ -187,7 +188,6 @@ class LandingFragment : Fragment(R.layout.fragment_landing) {
                 .showNow(parentFragmentManager, CreateAccountConfirmBottomSheetDialogFragment.TAG)
         }
         binding.continueTv.setOnClickListener {
-            AnalyticsTracker.trackLoginStart()
             activity?.addFragment(
                 this@LandingFragment,
                 MobileFragment.newInstance(from = FROM_LANDING),
diff --git a/app/src/main/java/one/mixin/android/ui/landing/LandingMnemonicPhraseFragment.kt b/app/src/main/java/one/mixin/android/ui/landing/LandingMnemonicPhraseFragment.kt
@@ -18,6 +18,7 @@ import one.mixin.android.ui.landing.components.MnemonicPhraseInput
 import one.mixin.android.ui.landing.components.MnemonicState
 import one.mixin.android.ui.logs.LogViewerBottomSheet
 import one.mixin.android.ui.web.WebFragment
+import one.mixin.android.util.analytics.AnalyticsTracker
 import one.mixin.android.util.viewBinding
 import timber.log.Timber
 
@@ -44,6 +45,7 @@ class LandingMnemonicPhraseFragment : BaseFragment(R.layout.fragment_landing_mne
             applySafeTopPadding(view)
         }
         Timber.e("LandingMnemonicPhraseFragment onViewCreated")
+        AnalyticsTracker.trackLoginMnemonicPhrase()
         binding.titleView.leftIb.setOnClickListener {
             requireActivity().onBackPressedDispatcher.onBackPressed()
         }
@@ -100,4 +102,4 @@ class LandingMnemonicPhraseFragment : BaseFragment(R.layout.fragment_landing_mne
         }
         ViewCompat.requestApplyInsets(rootView)
     }
-}
+}
diff --git a/app/src/main/java/one/mixin/android/ui/landing/LoadingFragment.kt b/app/src/main/java/one/mixin/android/ui/landing/LoadingFragment.kt
@@ -51,8 +51,13 @@ import javax.inject.Inject
 class LoadingFragment : BaseFragment(R.layout.fragment_loading) {
     companion object {
         const val TAG: String = "LoadingFragment"
+        private const val ARGS_SOURCE = "args_source"
 
-        fun newInstance() = LoadingFragment()
+        fun newInstance(source: String? = null) = LoadingFragment().apply {
+            arguments = Bundle().apply {
+                source?.let { putString(ARGS_SOURCE, it) }
+            }
+        }
     }
 
     @Inject
@@ -67,7 +72,10 @@ class LoadingFragment : BaseFragment(R.layout.fragment_loading) {
     ) {
         super.onViewCreated(view, savedInstanceState)
         MixinApplication.get().isOnline.set(true)
-        AnalyticsTracker.trackSignalInit()
+        when (arguments?.getString(ARGS_SOURCE)) {
+            InitializeActivity.SOURCE_SIGN_UP -> AnalyticsTracker.trackSignUpSignalInit()
+            InitializeActivity.SOURCE_LOGIN -> AnalyticsTracker.trackLoginSignalInit()
+        }
         checkAndLoad()
     }
 
diff --git a/app/src/main/java/one/mixin/android/ui/landing/LocalRestoreFragment.kt b/app/src/main/java/one/mixin/android/ui/landing/LocalRestoreFragment.kt
@@ -74,7 +74,7 @@ class LocalRestoreFragment : BaseFragment(R.layout.fragment_local_restore) {
             .setMessage(R.string.restore_message)
             .setNegativeButton(R.string.Skip) { dialog, _ ->
                 defaultSharedPreferences.putBoolean(Constants.Account.PREF_RESTORE, false)
-                InitializeActivity.showLoading(requireContext())
+                InitializeActivity.showLoading(requireContext(), source = InitializeActivity.SOURCE_LOGIN)
                 dialog.dismiss()
                 requireActivity().finish()
             }
@@ -92,7 +92,7 @@ class LocalRestoreFragment : BaseFragment(R.layout.fragment_local_restore) {
                                 }
                             },
                             {
-                                InitializeActivity.showLoading(requireContext())
+                                InitializeActivity.showLoading(requireContext(), source = InitializeActivity.SOURCE_LOGIN)
                                 requireActivity().finish()
                             },
                         )
@@ -194,7 +194,7 @@ class LocalRestoreFragment : BaseFragment(R.layout.fragment_local_restore) {
             .setPositiveButton(R.string.Skip) { dialog, _ ->
                 dialog.dismiss()
                 defaultSharedPreferences.putBoolean(Constants.Account.PREF_RESTORE, false)
-                InitializeActivity.showLoading(requireContext())
+                InitializeActivity.showLoading(requireContext(), source = InitializeActivity.SOURCE_LOGIN)
                 requireActivity().finish()
             }.create().run {
                 this.setCanceledOnTouchOutside(false)
@@ -249,7 +249,7 @@ class LocalRestoreFragment : BaseFragment(R.layout.fragment_local_restore) {
             }
         }
         binding.restoreSkip.setOnClickListener {
-            InitializeActivity.showLoading(requireContext())
+            InitializeActivity.showLoading(requireContext(), source = InitializeActivity.SOURCE_LOGIN)
             defaultSharedPreferences.putBoolean(Constants.Account.PREF_RESTORE, false)
             requireActivity().finish()
         }
@@ -270,7 +270,7 @@ class LocalRestoreFragment : BaseFragment(R.layout.fragment_local_restore) {
     private val restoreCallback: (result: Result) -> Unit = { result ->
         BackupNotification.cancel()
         if (result == Result.SUCCESS) {
-            InitializeActivity.showLoading(requireContext())
+            InitializeActivity.showLoading(requireContext(), source = InitializeActivity.SOURCE_LOGIN)
             defaultSharedPreferences.putBoolean(
                 Constants.Account.PREF_RESTORE,
                 false,
diff --git a/app/src/main/java/one/mixin/android/ui/landing/MnemonicPhraseFragment.kt b/app/src/main/java/one/mixin/android/ui/landing/MnemonicPhraseFragment.kt
@@ -189,12 +189,12 @@ class MnemonicPhraseFragment : BaseFragment(R.layout.fragment_compose) {
                 },
 
                 failureBlock = { r ->
-                    if (r.errorCode == NEED_CAPTCHA) {
-                        if (words.isNullOrEmpty()) {
-                            AnalyticsTracker.trackSignUpCaptcha("mnemonic_phrase")
-                        } else {
-                            AnalyticsTracker.trackLoginCaptcha("mnemonic_phrase")
-                        }
+                        if (r.errorCode == NEED_CAPTCHA) {
+                            if (words.isNullOrEmpty()) {
+                                AnalyticsTracker.trackSignUpCaptcha()
+                            } else {
+                                AnalyticsTracker.trackLoginCaptcha("mnemonic_phrase")
+                            }
                         initAndLoadCaptcha(sessionKey, edKey, r.errorDescription)
                     } else {
                         errorInfo = requireContext().getMixinErrorStringByCode(r.errorCode, r.errorDescription)
diff --git a/app/src/main/java/one/mixin/android/ui/landing/MobileFragment.kt b/app/src/main/java/one/mixin/android/ui/landing/MobileFragment.kt
@@ -133,6 +133,9 @@ class MobileFragment: BaseFragment(R.layout.fragment_mobile) {
             applySafeTopPadding(view)
         }
         Timber.e("MobileFragment onViewCreated")
+        if (from == FROM_LANDING) {
+            AnalyticsTracker.trackLoginStart()
+        }
         binding.apply {
             pin = requireArguments().getString(ARGS_PIN)
             if (pin != null) {
@@ -209,7 +212,6 @@ class MobileFragment: BaseFragment(R.layout.fragment_mobile) {
             keyboard.initPinKeys()
             keyboard.setOnClickKeyboardListener(mKeyboardListener)
             mnemonicPhrase.setOnClickListener {
-                AnalyticsTracker.trackLoginMnemonicPhrase()
                 activity?.addFragment(
                     this@MobileFragment,
                     LandingMnemonicPhraseFragment.newInstance(),
@@ -306,6 +308,9 @@ class MobileFragment: BaseFragment(R.layout.fragment_mobile) {
             )
             .setNegativeButton(R.string.Change) { dialog, _ -> dialog.dismiss() }
             .setPositiveButton(R.string.Confirm) { dialog, _ ->
+                if (from == FROM_LANDING) {
+                    AnalyticsTracker.trackLoginSmsSendConfirmed()
+                }
                 requestSend()
                 dialog.dismiss()
             }
@@ -438,7 +443,7 @@ class MobileFragment: BaseFragment(R.layout.fragment_mobile) {
                 (view as ViewGroup).addView(captchaView?.webView, MATCH_PARENT, MATCH_PARENT)
             }
             if (from == FROM_LANDING_CREATE) {
-                AnalyticsTracker.trackSignUpCaptcha("phone_number")
+                AnalyticsTracker.trackSignUpCaptcha()
             } else if (from == FROM_LANDING) {
                 AnalyticsTracker.trackLoginCaptcha("phone_number")
             }
diff --git a/app/src/main/java/one/mixin/android/ui/landing/RestoreFragment.kt b/app/src/main/java/one/mixin/android/ui/landing/RestoreFragment.kt
@@ -91,7 +91,7 @@ class RestoreFragment : BaseFragment(R.layout.fragment_restore) {
             skipTv.setOnClickListener {
                 AnalyticsTracker.trackLoginRestore("skip")
                 Timber.e("RestoreFragment skip")
-                InitializeActivity.showLoading(requireContext())
+                InitializeActivity.showLoading(requireContext(), source = InitializeActivity.SOURCE_LOGIN)
                 defaultSharedPreferences.putBoolean(Constants.Account.PREF_RESTORE, false)
                 requireActivity().finish()
             }
diff --git a/app/src/main/java/one/mixin/android/ui/landing/SetupNameFragment.kt b/app/src/main/java/one/mixin/android/ui/landing/SetupNameFragment.kt
@@ -112,7 +112,7 @@ class SetupNameFragment : BaseFragment(R.layout.fragment_setup_name) {
                         if (!PrivacyPreference.getIsLoaded(requireContext(), false) ||
                             !PrivacyPreference.getIsSyncSession(context, false)
                         ) {
-                            InitializeActivity.showLoading(context, false)
+                            InitializeActivity.showLoading(context, false, source = InitializeActivity.SOURCE_SIGN_UP)
                         } else {
                             startActivity(Intent(context, MainActivity::class.java))
                         }
diff --git a/app/src/main/java/one/mixin/android/ui/landing/SetupPinFragment.kt b/app/src/main/java/one/mixin/android/ui/landing/SetupPinFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.compose.animation.AnimatedContentTransitionScope
 import androidx.compose.animation.core.tween
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -108,6 +109,9 @@ class SetupPinFragment : BaseFragment(R.layout.fragment_compose) {
                         )
                     }
                     composable(SetupPinDestination.Quiz.name) {
+                        LaunchedEffect(Unit) {
+                            AnalyticsTracker.trackSignUpPinQuiz()
+                        }
                         QuizPage(
                             next = {
                                 Timber.e("$TAG Quiz completed")
@@ -133,4 +137,4 @@ class SetupPinFragment : BaseFragment(R.layout.fragment_compose) {
             }
         }
     }
-}
+}
diff --git a/app/src/main/java/one/mixin/android/ui/tip/TipFragment.kt b/app/src/main/java/one/mixin/android/ui/tip/TipFragment.kt
@@ -72,9 +72,6 @@ class TipFragment : BaseFragment(R.layout.fragment_tip) {
         super.onViewCreated(view, savedInstanceState)
         Timber.e("$TAG onViewCreated type: ${tipBundle.tipType}, event: ${tipBundle.tipEvent}")
         binding.apply {
-            if (tipBundle.tipType == TipType.Create) {
-                AnalyticsTracker.trackSignUpPinSet()
-            }
             closeIv.setOnClickListener {
                 activity?.onBackPressedDispatcher?.onBackPressed()
             }
@@ -377,9 +374,6 @@ class TipFragment : BaseFragment(R.layout.fragment_tip) {
                 TipType.Create -> toast(R.string.Set_PIN_successfully)
                 TipType.Upgrade -> toast(R.string.Upgrade_TIP_successfully)
             }
-            if (tipBundle.tipType == TipType.Create) {
-                AnalyticsTracker.trackSignUpEnd()
-            }
             activity?.finish()
         }
 
diff --git a/app/src/main/java/one/mixin/android/ui/wallet/WalletActivity.kt b/app/src/main/java/one/mixin/android/ui/wallet/WalletActivity.kt
@@ -22,6 +22,7 @@ import one.mixin.android.ui.wallet.TransactionsFragment.Companion.ARGS_FROM_MARK
 import one.mixin.android.ui.wallet.fiatmoney.CalculateFragment
 import one.mixin.android.ui.wallet.fiatmoney.FiatMoneyViewModel
 import one.mixin.android.ui.wallet.fiatmoney.RouteProfile
+import one.mixin.android.util.analytics.AnalyticsTracker
 import one.mixin.android.vo.User
 import one.mixin.android.vo.market.MarketItem
 import one.mixin.android.vo.safe.TokenItem
@@ -119,6 +120,10 @@ class WalletActivity : BlazeBaseActivity() {
                         CalculateFragment.ARGS_IS_WEB3,
                         intent.getBooleanExtra(CalculateFragment.ARGS_IS_WEB3, false)
                     )
+                    putString(
+                        CalculateFragment.ARGS_BUY_SOURCE,
+                        intent.getStringExtra(CalculateFragment.ARGS_BUY_SOURCE)
+                    )
                     putString(
                         CalculateFragment.ARGS_WALLET_ID_FOR_CALCULATE,
                         intent.getStringExtra(CalculateFragment.ARGS_WALLET_ID_FOR_CALCULATE)
@@ -260,13 +265,15 @@ class WalletActivity : BlazeBaseActivity() {
             state: FiatMoneyViewModel.CalculateState?,
             routeProfile: RouteProfile?,
             walletId: String? = null,
+            source: String = AnalyticsTracker.TradeSource.WALLET_HOME,
         ) {
             activity.startActivity(
                 Intent(activity, WalletActivity::class.java).apply {
                     putExtra(DESTINATION, Destination.Buy)
                     state?.let { putExtra(CalculateFragment.CALCULATE_STATE, it) }
                     routeProfile?.let { putExtra(ARGS_ROUTE_PROFILE, it) }
                     putExtra(CalculateFragment.ARGS_IS_WEB3, isWeb3)
+                    putExtra(CalculateFragment.ARGS_BUY_SOURCE, source)
                     walletId?.let { putExtra(CalculateFragment.ARGS_WALLET_ID_FOR_CALCULATE, it) }
                 },
             )
diff --git a/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/CalculateFragment.kt b/app/src/main/java/one/mixin/android/ui/wallet/fiatmoney/CalculateFragment.kt
diff --git a/app/src/main/java/one/mixin/android/util/analytics/AnalyticsTracker.kt b/app/src/main/java/one/mixin/android/util/analytics/AnalyticsTracker.kt
diff --git a/build.gradle b/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,13 @@ class ExploreFragment : BaseFragment() {`
`328`	`328`	`DeviceFragment.newInstance().showNow(parentFragmentManager, DeviceFragment.TAG)`
`329`	`329`	`}`
`330`	`330`	`INTERNAL_BUY_ID -> {`
`331`		`- WalletActivity.showBuy(requireActivity(), false, null, null)`
	`331`	`+ WalletActivity.showBuy(`
	`332`	`+ requireActivity(),`
	`333`	`+ false,`
	`334`	`+ null,`
	`335`	`+ null,`
	`336`	`+ source = AnalyticsTracker.TradeSource.EXPLORE`
	`337`	`+ )`
`332`	`338`	`}`
`333`	`339`	`INTERNAL_SWAP_ID -> {`
`334`	`340`	`AnalyticsTracker.trackTradeStart(TradeWallet.MAIN, AnalyticsTracker.TradeSource.EXPLORE)`
`@@ -568,4 +574,4 @@ class ExploreFragment : BaseFragment() {`
`568`	`574`	`itemBinding.title.setText(res)`
`569`	`575`	`}`
`570`	`576`	`}`
`571`		`-}`
	`577`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ import one.mixin.android.ui.landing.components.MnemonicPhraseInput`
`18`	`18`	`import one.mixin.android.ui.landing.components.MnemonicState`
`19`	`19`	`import one.mixin.android.ui.logs.LogViewerBottomSheet`
`20`	`20`	`import one.mixin.android.ui.web.WebFragment`
	`21`	`+import one.mixin.android.util.analytics.AnalyticsTracker`
`21`	`22`	`import one.mixin.android.util.viewBinding`
`22`	`23`	`import timber.log.Timber`
`23`	`24`
`@@ -44,6 +45,7 @@ class LandingMnemonicPhraseFragment : BaseFragment(R.layout.fragment_landing_mne`
`44`	`45`	`applySafeTopPadding(view)`
`45`	`46`	`}`
`46`	`47`	`Timber.e("LandingMnemonicPhraseFragment onViewCreated")`
	`48`	`+ AnalyticsTracker.trackLoginMnemonicPhrase()`
`47`	`49`	`binding.titleView.leftIb.setOnClickListener {`
`48`	`50`	`requireActivity().onBackPressedDispatcher.onBackPressed()`
`49`	`51`	`}`
`@@ -100,4 +102,4 @@ class LandingMnemonicPhraseFragment : BaseFragment(R.layout.fragment_landing_mne`
`100`	`102`	`}`
`101`	`103`	`ViewCompat.requestApplyInsets(rootView)`
`102`	`104`	`}`
`103`		`-}`
	`105`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ class RestoreFragment : BaseFragment(R.layout.fragment_restore) {`
`91`	`91`	`skipTv.setOnClickListener {`
`92`	`92`	`AnalyticsTracker.trackLoginRestore("skip")`
`93`	`93`	`Timber.e("RestoreFragment skip")`
`94`		`- InitializeActivity.showLoading(requireContext())`
	`94`	`+ InitializeActivity.showLoading(requireContext(), source = InitializeActivity.SOURCE_LOGIN)`
`95`	`95`	`defaultSharedPreferences.putBoolean(Constants.Account.PREF_RESTORE, false)`
`96`	`96`	`requireActivity().finish()`
`97`	`97`	`}`