@momo-kits/native-kits 0.162.21 → 0.162.22-debug

package/gradlew

@@ -0,0 +1,252 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

package/gradlew.bat

@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

package/ios/Application/ApplicationEnvironment.swift

@@ -41,11 +41,13 @@ public class ApplicationEnvironment: ObservableObject {
     let applicationContext: MiniAppContext?
     let composeApi: KitComposeApi?
     let config: KitConfig?
-    
-    public init(applicationContext: MiniAppContext? = nil, composeApi: KitComposeApi? = nil, config: KitConfig? = nil) {
+    let maxApi: MaxApi?
+
+    public init(applicationContext: MiniAppContext? = nil, composeApi: KitComposeApi? = nil, config: KitConfig? = nil, maxApi: MaxApi? = nil) {
         self.applicationContext = applicationContext
         self.composeApi = composeApi
         self.config = config
+        self.maxApi = maxApi
     }
 }
 

package/ios/Application/MaxApi.swift

@@ -0,0 +1,18 @@
+//
+//  MaxApi.swift
+//  MoMoUIKits
+//
+//  Swift mirror of the host-app bridge exposed on Kotlin as `vn.momo.maxapi.IMaxApi`
+//  (`LocalMaxApi`). `IMaxApi` itself is an external compiled dependency with no
+//  source in this repo, so this protocol intentionally exposes only the methods
+//  this kit's Kotlin source actually calls (`track`, `dismiss`, `getLanguage`) —
+//  not a full guess at IMaxApi's real surface.
+//
+
+import Foundation
+
+public protocol MaxApi {
+    func track(eventName: String, params: [String: Any?])
+    func dismiss(completion: (() -> Void)?)
+    func getLanguage(callback: @escaping ([String: Any?]?) -> Void)
+}

package/ios/Application/Navigation/NavigationContainer.swift

@@ -18,6 +18,7 @@ public struct NavigationContainer<Initial: View>: View {
 
     private let setNavigator: ((Navigator) -> Void)?
     private let composeApi: KitComposeApi?
+    private let maxApi: MaxApi?
 
     public init(
         initialScreenName: String = "",
@@ -26,6 +27,7 @@ public struct NavigationContainer<Initial: View>: View {
         applicationContext: MiniAppContext? = nil,
         composeApi: KitComposeApi? = nil,
         config: KitConfig? = nil,
+        maxApi: MaxApi? = nil,
         localize: Localize? = nil,
         setNavigator: ((Navigator) -> Void)? = nil
     ) {
@@ -40,11 +42,13 @@ public struct NavigationContainer<Initial: View>: View {
             wrappedValue: ApplicationEnvironment(
                 applicationContext: applicationContext,
                 composeApi: composeApi,
-                config: config
+                config: config,
+                maxApi: maxApi
             )
         )
         _localize = StateObject(wrappedValue: localize ?? Localize())
         self.composeApi = composeApi
+        self.maxApi = maxApi
         self.setNavigator = setNavigator
     }
 
@@ -80,12 +84,19 @@ public struct NavigationContainer<Initial: View>: View {
                 navigator.composeApi = composeApi
             }
             setNavigator?(navigator)
+            // Mirrors Compose's LaunchedEffect(maxApi, resolvedLocalize): host-reported
+            // language wins over the default "vi" only when it resolves to English.
+            maxApi?.getLanguage { data in
+                if parseLanguage(data) == Localize.EN {
+                    localize.changeLanguage(Localize.EN)
+                }
+            }
         }
     }
 
     @ViewBuilder
     private func screenView(for route: DynamicScreenRoute) -> some View {
-        if let screen = DynamicScreenRegistry.shared.getScreen(id: route.id) {
+        if let screen = navigator.registry.getScreen(id: route.id) {
             ScreenHost(screen: screen, navigator: navigator)
                 .navigationBarBackButtonHidden(true)
         } else {
@@ -95,7 +106,7 @@ public struct NavigationContainer<Initial: View>: View {
 
     @ViewBuilder
     private func screenView(forDialog route: DynamicDialogRoute) -> some View {
-        if let screen = DynamicScreenRegistry.shared.getScreen(id: route.id) {
+        if let screen = navigator.registry.getScreen(id: route.id) {
             ScreenHost(screen: screen, navigator: navigator)
         } else {
             EmptyView()
@@ -134,6 +145,7 @@ private struct ScreenHost: View {
             layoutOffset: options.layoutOffset,
             inputSearchProps: options.inputSearchProps,
             fabProps: options.fabProps,
+            screenName: screen.name,
             content: { screen.content() }
         )
     }
@@ -180,3 +192,9 @@ private func safeAreaBottomInset() -> CGFloat {
         .compactMap { ($0 as? UIWindowScene)?.keyWindow?.safeAreaInsets.bottom }
         .first ?? 0
 }
+
+private func parseLanguage(_ raw: [String: Any?]?) -> String? {
+    guard let response = (raw?["response"] as? String)?.trimmingCharacters(in: .whitespaces).lowercased(),
+          !response.isEmpty else { return nil }
+    return response.hasPrefix(Localize.EN) ? Localize.EN : Localize.VI
+}

package/ios/Application/Navigation/Navigator.swift

@@ -30,12 +30,10 @@ public struct DynamicScreen {
 }
 
 public final class DynamicScreenRegistry {
-    public static let shared = DynamicScreenRegistry()
-
     private var screens: [Int: DynamicScreen] = [:]
     private var idCounter: Int = 1
 
-    private init() {}
+    public init() {}
 
     @discardableResult
     public func register(
@@ -95,6 +93,11 @@ public final class Navigator: ObservableObject {
     @Published public var presented: DynamicDialogRoute?
     @Published public var overplay: OverplayItem?
 
+    /// Owned per-Navigator (mirrors Compose's `remember { DynamicScreenRegistry() }` +
+    /// disposal): screens registered by this navigator are released via ARC when the
+    /// navigator itself deallocates, instead of accumulating in a process-wide singleton.
+    public let registry = DynamicScreenRegistry()
+
     /// Animated-close handler registered by the active overplay component
     /// (mirrors Compose's `OverplayComponentRegistry.bindClose`). When set, a
     /// dismiss request runs the component's exit animation before the item is
@@ -111,7 +114,7 @@ public final class Navigator: ObservableObject {
         composeApi: KitComposeApi? = nil
     ) {
         self.composeApi = composeApi
-        self.rootRoute = DynamicScreenRegistry.shared.register(
+        self.rootRoute = registry.register(
             screenName: initialScreenName,
             content: initialContent,
             options: options
@@ -121,7 +124,7 @@ public final class Navigator: ObservableObject {
     // MARK: Stack
 
     public func push<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
-        let route = DynamicScreenRegistry.shared.register(
+        let route = registry.register(
             screenName: options?.screenName ?? "",
             content: { AnyView(content()) },
             options: options
@@ -134,7 +137,7 @@ public final class Navigator: ObservableObject {
         @ViewBuilder _ content: @escaping () -> V,
         options: NavigationOptions? = nil
     ) {
-        let route = DynamicScreenRegistry.shared.register(
+        let route = registry.register(
             screenName: screenName,
             content: { AnyView(content()) },
             options: options
@@ -145,7 +148,7 @@ public final class Navigator: ObservableObject {
     public func replace<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
         guard !path.isEmpty else { return }
         let removed = path.removeLast()
-        DynamicScreenRegistry.shared.unregister(id: removed.id)
+        registry.unregister(id: removed.id)
         push(content, options: options)
     }
 
@@ -156,15 +159,15 @@ public final class Navigator: ObservableObject {
     ) {
         guard !path.isEmpty else { return }
         let removed = path.removeLast()
-        DynamicScreenRegistry.shared.unregister(id: removed.id)
+        registry.unregister(id: removed.id)
         push(screenName: screenName, content, options: options)
     }
 
     public func reset<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
-        for route in path { DynamicScreenRegistry.shared.unregister(id: route.id) }
-        DynamicScreenRegistry.shared.unregister(id: rootRoute.id)
+        for route in path { registry.unregister(id: route.id) }
+        registry.unregister(id: rootRoute.id)
         path.removeAll()
-        let route = DynamicScreenRegistry.shared.register(
+        let route = registry.register(
             screenName: options?.screenName ?? "",
             content: { AnyView(content()) },
             options: options
@@ -177,10 +180,10 @@ public final class Navigator: ObservableObject {
         @ViewBuilder _ content: @escaping () -> V,
         options: NavigationOptions? = nil
     ) {
-        for route in path { DynamicScreenRegistry.shared.unregister(id: route.id) }
-        DynamicScreenRegistry.shared.unregister(id: rootRoute.id)
+        for route in path { registry.unregister(id: route.id) }
+        registry.unregister(id: rootRoute.id)
         path.removeAll()
-        let route = DynamicScreenRegistry.shared.register(
+        let route = registry.register(
             screenName: screenName,
             content: { AnyView(content()) },
             options: options
@@ -191,17 +194,16 @@ public final class Navigator: ObservableObject {
     public func pop(_ count: Int = 1, callback: (() -> Void)? = nil) {
         var remaining = count
         while remaining > 0 {
-            if overplay != nil {
+            if overplay?.type == .snackBar {
+                // Mirrors Kotlin: a snackbar doesn't block back-navigation, so popping
+                // while one is showing pops the screen underneath and clears the
+                // snackbar immediately, without playing its dismiss animation.
+                overplayDismissHandler = nil
+                overplay = nil
+                if !popScreen() { break }
+            } else if overplay != nil {
                 hideOverplay()
-            } else if presented != nil {
-                let dismissedId = presented?.id
-                presented = nil
-                if let id = dismissedId { DynamicScreenRegistry.shared.unregister(id: id) }
-            } else if !path.isEmpty {
-                let removed = path.removeLast()
-                DynamicScreenRegistry.shared.unregister(id: removed.id)
-            } else {
-                composeApi?.requestCallback(funcName: "dismiss", params: nil, onResponse: nil)
+            } else if !popScreen() {
                 break
             }
             remaining -= 1
@@ -209,13 +211,32 @@ public final class Navigator: ObservableObject {
         callback?()
     }
 
+    /// Pops the topmost presented screen or stack entry. Returns `false` (and requests
+    /// a host dismiss) when there is nothing left to pop.
+    @discardableResult
+    private func popScreen() -> Bool {
+        if presented != nil {
+            let dismissedId = presented?.id
+            presented = nil
+            if let id = dismissedId { registry.unregister(id: id) }
+            return true
+        } else if !path.isEmpty {
+            let removed = path.removeLast()
+            registry.unregister(id: removed.id)
+            return true
+        } else {
+            composeApi?.requestCallback(funcName: "dismiss", params: nil, onResponse: nil)
+            return false
+        }
+    }
+
     public func popToRoot() {
-        for route in path { DynamicScreenRegistry.shared.unregister(id: route.id) }
+        for route in path { registry.unregister(id: route.id) }
         path.removeAll()
     }
 
     public func onBackSafe(callback: (() -> Void)? = nil) {
-        let latest = DynamicScreenRegistry.shared.latest()
+        let latest = registry.latest()
         if let onBack = latest?.options?.onBackHandler {
             onBack()
             return
@@ -256,7 +277,7 @@ public final class Navigator: ObservableObject {
     // MARK: Modal-style screen (vertical slide)
 
     public func present<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
-        let route = DynamicScreenRegistry.shared.register(
+        let route = registry.register(
             screenName: options?.screenName ?? "",
             content: { AnyView(content()) },
             options: options
@@ -269,7 +290,7 @@ public final class Navigator: ObservableObject {
         @ViewBuilder _ content: @escaping () -> V,
         options: NavigationOptions? = nil
     ) {
-        let route = DynamicScreenRegistry.shared.register(
+        let route = registry.register(
             screenName: screenName,
             content: { AnyView(content()) },
             options: options
@@ -279,7 +300,7 @@ public final class Navigator: ObservableObject {
 
     public func dismiss() {
         if let id = presented?.id {
-            DynamicScreenRegistry.shared.unregister(id: id)
+            registry.unregister(id: id)
         }
         presented = nil
     }

package/ios/Application/Navigation/Overplay/ModalScreen.swift

@@ -15,6 +15,7 @@ struct ModalScreen<Content: View>: View {
     let content: () -> Content
 
     @EnvironmentObject private var navigator: Navigator
+    @Environment(\.applicationEnvironment) private var appEnv
 
     @State private var scrimOpacity: CGFloat = 0
     @State private var contentScale: CGFloat = 0.8
@@ -38,6 +39,11 @@ struct ModalScreen<Content: View>: View {
         .onAppear {
             guard !didAppear else { return }
             didAppear = true
+            ScreenTracker.trackPopupDisplayed(
+                maxApi: appEnv.maxApi,
+                context: appEnv.applicationContext,
+                parentScreenName: ScreenTracker.getLastScreenName()
+            )
             navigator.registerOverplayDismiss { close() }
             open()
         }