@momo-kits/native-kits 0.167.1-duo.5-debug → 0.167.1-duo.6

package/ios/Application/StackScreen.swift

@@ -104,6 +104,9 @@ public struct StackScreen<Content: View>: View {
     @State private var isBottomTabRoot: Bool = false
 
     @Environment(\.applicationEnvironment) private var appEnv
+    @Environment(\.screenLayout) private var layout
+    @Environment(\.duoTabBarInsets) private var duoTabBarInsets
+    @State private var footerHeight: CGFloat = 0
 
     // Auto-tracking state (mirrors Compose's `remember { ScreenTrackingState() }` +
     // the once-computed push/back `action`).
@@ -125,6 +128,30 @@ public struct StackScreen<Content: View>: View {
 
     private static var headerHeight: CGFloat { 52 }
 
+    private var toolkit: (data: HeaderRightData?, tintColor: Color?)? { toolkitHeaderRight(headerRight) }
+
+    private var showsSideBar: Bool {
+        layout.sideBar != nil && headerType != .none && !isBottomTabRoot && (goBack != nil || toolkit != nil)
+    }
+
+    /// iPhone Duo: content scrolls under a glass header instead of starting below it.
+    private var useDuoGlass: Bool {
+        layout.sideBar != nil && headerType != .none && animatedHeader == nil
+            && inputSearchProps == nil && !headerTransparent && !fullScreenContent
+    }
+
+    /// Height the footer, tab bar or home indicator takes from the bottom of the window.
+    private var bottomBarsHeight: CGFloat {
+        if footer != nil { return footerHeight + NavigationFooter.safeAreaBottom }
+        if duoTabBarInsets.sideBarReserve > 0 { return duoTabBarInsets.sideBarReserve - Spacing.XL }
+        return NavigationFooter.navigationBarInset
+    }
+
+    /// Keyboard frames are in screen coordinates; UIScreen stays on the outer display on iPhone Duo.
+    private var keyboardReferenceHeight: CGFloat {
+        layout.isIPhoneDuo ? layout.height : UIScreen.main.bounds.height
+    }
+
     /// Extra top space reserved inside the content so the animated search bar has
     /// room below the header at scroll 0; it shrinks to 0 as the bar slides up.
     private var animatedSearchInset: CGFloat {
@@ -163,9 +190,18 @@ public struct StackScreen<Content: View>: View {
                             hasFooter: footer != nil,
                             scrollOffset: scrollOffset
                         )
+                        .padding(.bottom, footer == nil ? duoTabBarInsets.overlay : 0)
                     }
 
                     NavigationFooter(footerComponent: footer, keyboardSize: keyboardSize)
+                        .padding(.bottom, duoTabBarInsets.overlay)
+                        .background(
+                            GeometryReader { proxy in
+                                Color.clear
+                                    .onAppear { footerHeight = proxy.size.height }
+                                    .onChange(of: proxy.size.height) { footerHeight = $0 }
+                            }
+                        )
                 }
 
                 // Animated search bar overlay (mirrors Compose's SearchAnimated layer).
@@ -176,7 +212,24 @@ public struct StackScreen<Content: View>: View {
                         hiddenBack: !isBack,
                         hasHeaderRight: headerRight != nil,
                         headerRightWidth: headerRightWidth,
-                        headerHeight: Self.headerHeight
+                        headerHeight: Self.headerHeight,
+                        useSideBar: layout.sideBar != nil,
+                        hasToolkit: toolkit != nil
+                    )
+                }
+
+                if showsSideBar, let sideBar = layout.sideBar {
+                    HeaderSideBar(
+                        sideBar: sideBar,
+                        goBack: goBack,
+                        toolkit: toolkit,
+                        headerColor: getHeaderColor(
+                            isAnimated: animatedHeader != nil,
+                            isSurface: animatedHeader?.isSurface ?? true,
+                            opacity: scrollOpacity,
+                            tintColor: tintColor
+                        ),
+                        bottomInset: bottomBarsHeight
                     )
                 }
             }
@@ -191,7 +244,7 @@ public struct StackScreen<Content: View>: View {
                 guard useAvoidKeyboard,
                       let endFrame = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect else { return }
                 withAnimation(.easeOut(duration: 0.25)) {
-                    keyboardHeight = UIScreen.main.bounds.height - endFrame.origin.y
+                    keyboardHeight = keyboardReferenceHeight - endFrame.origin.y
                 }
             }
             // Mirrors Compose's `hideKeyboardOnTap()`: a simultaneous gesture so
@@ -246,15 +299,25 @@ public struct StackScreen<Content: View>: View {
                     scrollOffset: $scrollOffset,
                     scrollToTopCallback: scrollToTopCallback,
                     animatedSearchInset: animatedSearchInset,
+                    bottomInset: duoTabBarInsets.overlay,
                     content: { animatedHeroBody(animatedHeader) }
                 )
                 .edgesIgnoringSafeArea(.all)
 
                 header
                     .background(
-                        Colors.black01
-                            .opacity(scrollOpacity)
-                            .edgesIgnoringSafeArea(.top)
+                        Group {
+                            if layout.sideBar != nil {
+                                // glass shows once the banner has scrolled under the header
+                                Color.clear.modifier(DuoBarMaterial(
+                                    shape: Rectangle(),
+                                    visible: scrollOffset > heroGlassStart(animatedHeader)
+                                ))
+                            } else {
+                                Colors.black01.opacity(scrollOpacity)
+                            }
+                        }
+                        .edgesIgnoringSafeArea([.top, .horizontal])
                     )
                     .zIndex(100)
             }
@@ -271,9 +334,34 @@ public struct StackScreen<Content: View>: View {
                     )
                     .zIndex(100)
 
-                StackScreenContent(scrollable: scrollable, scrollOffset: $scrollOffset, scrollToTopCallback: scrollToTopCallback, animatedSearchInset: animatedSearchInset, content: content)
+                StackScreenContent(scrollable: scrollable, scrollOffset: $scrollOffset, scrollToTopCallback: scrollToTopCallback, animatedSearchInset: animatedSearchInset, bottomInset: duoTabBarInsets.overlay, content: { duoInsetContent })
                     .edgesIgnoringSafeArea(.all)
             }
+        } else if useDuoGlass {
+            ZStack(alignment: .top) {
+                DuoScrollGradient(
+                    scrollOffset: scrollOffset,
+                    headerHeight: layout.headerHeight,
+                    extended: headerType == .extended
+                )
+
+                StackScreenContent(
+                    scrollable: scrollable,
+                    scrollOffset: $scrollOffset,
+                    scrollToTopCallback: scrollToTopCallback,
+                    topInset: layout.headerHeight - layout.insets.top,
+                    bottomInset: duoTabBarInsets.overlay,
+                    content: content
+                )
+
+                header
+                    .background(
+                        Color.clear
+                            .modifier(DuoBarMaterial(shape: Rectangle(), visible: scrollOffset > 0))
+                            .edgesIgnoringSafeArea([.top, .horizontal])
+                    )
+                    .zIndex(100)
+            }
         } else {
             header
                 .background(
@@ -283,28 +371,40 @@ public struct StackScreen<Content: View>: View {
                         headerTransparent: headerTransparent,
                         fullScreenContent: fullScreenContent
                     )
-                    .edgesIgnoringSafeArea(.top)
+                    .edgesIgnoringSafeArea([.top, .horizontal])
                 )
 
-            StackScreenContent(scrollable: scrollable, scrollOffset: $scrollOffset, scrollToTopCallback: scrollToTopCallback, animatedSearchInset: animatedSearchInset, content: content)
+            StackScreenContent(scrollable: scrollable, scrollOffset: $scrollOffset, scrollToTopCallback: scrollToTopCallback, animatedSearchInset: animatedSearchInset, bottomInset: duoTabBarInsets.overlay, content: content)
         }
     }
 
+    /// Edge-to-edge branches lay out outside the safe area; iPhone Duo content still keeps
+    /// clear of the side strips, as RN's Screen does.
+    private var duoInsetContent: some View {
+        content()
+            .padding(.leading, layout.insetLeft)
+            .padding(.trailing, layout.insetRight)
+    }
+
+    private func heroGlassStart(_ animatedHeader: AnimatedHeader) -> CGFloat {
+        max(layout.width / animatedHeader.aspectRatio.value - layout.headerHeight, 0)
+    }
+
     /// Hero image + body for an animated header. The image fills the width at its
     /// aspect-ratio height; the body is offset below the header band so it overlaps
     /// the lower part of the image (mirrors Compose's image box + padded content).
     @ViewBuilder
     private func animatedHeroBody(_ animatedHeader: AnimatedHeader) -> some View {
-        let width = UIScreen.main.bounds.width
+        let width = layout.width
         let imageHeight = width / animatedHeader.aspectRatio.value
-        let contentTopInset = safeAreaTopInset() + HEADER_HEIGHT + layoutOffset
+        let contentTopInset = layout.headerHeight + layoutOffset
 
         ZStack(alignment: .top) {
             animatedHeader.composable(scrollOffset)
                 .frame(width: width, height: imageHeight)
                 .clipped()
 
-            content()
+            duoInsetContent
                 .padding(.top, contentTopInset)
         }
         .frame(maxWidth: .infinity, alignment: .top)
@@ -343,6 +443,10 @@ private struct StackScreenContent<Content: View>: View {
     /// Extra top space reserved for the animated search bar (mirrors Compose's
     /// MainContent animated top spacer). Zero for non-animated screens.
     var animatedSearchInset: CGFloat = 0
+    /// Room for a header the content scrolls under (iPhone Duo glass header).
+    var topInset: CGFloat = 0
+    /// Room for a bar that overlays the content (iPhone Duo floating tab bar).
+    var bottomInset: CGFloat = 0
     let content: () -> Content
 
     private let topAnchorID = "stack_screen_top_anchor"
@@ -369,13 +473,17 @@ private struct StackScreenContent<Content: View>: View {
                                     }
                             })
 
-                        if animatedSearchInset > 0 {
-                            Spacer().frame(height: animatedSearchInset)
+                        if animatedSearchInset + topInset > 0 {
+                            Spacer().frame(height: animatedSearchInset + topInset)
                         }
 
                         VStack {
                             content()
                         }
+
+                        if bottomInset > 0 {
+                            Spacer().frame(height: bottomInset)
+                        }
                     }
                 }
                 .coordinateSpace(name: scrollSpace)
@@ -390,6 +498,8 @@ private struct StackScreenContent<Content: View>: View {
             }
         } else {
             content()
+                .padding(.top, topInset)
+                .padding(.bottom, bottomInset)
         }
     }
 }
@@ -407,16 +517,23 @@ private struct SearchAnimatedHeader: View {
     let hasHeaderRight: Bool
     let headerRightWidth: CGFloat
     let headerHeight: CGFloat
+    var useSideBar: Bool = false
+    var hasToolkit: Bool = false
+
+    @Environment(\.screenLayout) private var layout
 
     var body: some View {
         let scroll = max(scrollOffset, 0)
 
-        // Insets are measured from the safe-area top (status bar handled by layout).
-        let minTop: CGFloat = 0
-        let maxTop = headerHeight
+        // Insets are measured from the safe-area top; collapsed, the search is centered in the bar row.
+        let rowTop = min(layout.headerStatusBarHeight - layout.insets.top, 0)
+        let minTop = rowTop + (layout.headerBarHeight - headerHeight) / 2
+        let maxTop = layout.headerHeight - layout.insets.top
         let minSide = Spacing.M
-        let maxStart: CGFloat = hiddenBack ? Spacing.M : 48
-        let maxEnd = headerRightWidth + (hasHeaderRight ? Spacing.M * 2 : Spacing.M)
+        let maxStart: CGFloat = hiddenBack || useSideBar ? Spacing.M : 48
+        let maxEnd: CGFloat = useSideBar && hasToolkit
+            ? Spacing.M
+            : headerRightWidth + (hasHeaderRight ? Spacing.M * 2 : Spacing.M)
 
         let top = min(max(maxTop - scroll, minTop), maxTop)
         let start = min(max(minSide + scroll, minSide), maxStart)

package/ios/Popup/PopupDisplay.swift

@@ -55,6 +55,7 @@ extension View {
 
 public struct PopupDisplay: View {
     @Environment(\.localize) private var localize
+    @Environment(\.screenLayout) private var layout
 
     // MARK: Lifecycle
 
@@ -91,6 +92,7 @@ public struct PopupDisplay: View {
 
     @State private var textHeight: CGFloat = .zero
     @State private var isScrollable = false
+    @State private var actionsHeight: CGFloat = 0
     
     public var body: some View {
         var shouldUseColumn: Bool {
@@ -114,89 +116,103 @@ public struct PopupDisplay: View {
                 }
                 
                 VStack(spacing: 0) {
-                    if(!url.isEmpty) {
-                        WebImage(url: URL(string: url), isAnimating: .constant(true))
-                            .resizable()
-                            .placeholder {
-                                Rectangle()
-                                    .fill(Color.gray.opacity(0.3))
+                    // scrolls when iPhone Duo landscape is too short; actions stay visible
+                    PopupScrollBody(maxHeight: layout.popupMaxHeight.map { $0 - actionsHeight }) {
+                        VStack(spacing: 0) {
+                            if(!url.isEmpty) {
+                                WebImage(url: URL(string: url), isAnimating: .constant(true))
+                                    .resizable()
+                                    .placeholder {
+                                        Rectangle()
+                                            .fill(Color.gray.opacity(0.3))
+                                            .aspectRatio(1.777, contentMode: .fit)
+                                            .frame(maxWidth: .infinity, maxHeight: 184)
+                                    }
                                     .aspectRatio(1.777, contentMode: .fit)
-                                    .frame(maxWidth: .infinity, maxHeight: 184)
+                                    .frame(maxWidth: .infinity, alignment: .center)
+                                    .clipShape(RoundedCorner(radius: 15, corners: [.topLeft, .topRight]))
+                                    .clipped()
                             }
-                            .aspectRatio(1.777, contentMode: .fit)
-                            .frame(maxWidth: .infinity, alignment: .center)
-                            .clipShape(RoundedCorner(radius: 15, corners: [.topLeft, .topRight]))
-                            .clipped()
-                    }
-                    VStack(alignment: .leading, spacing: 0) {
-                        MomoText(title, typography: .headerDefaultBold)
-                            .padding(.top, 24)
-                            .padding(.bottom, 8)
-                            .lineLimit(2)
-                            .accessibility(identifier: "title_popup_permission")
+                            VStack(alignment: .leading, spacing: 0) {
+                                MomoText(title, typography: .headerDefaultBold)
+                                    .padding(.top, 24)
+                                    .padding(.bottom, 8)
+                                    .lineLimit(2)
+                                    .accessibility(identifier: "title_popup_permission")
                         
-                        Group {
-                            if isScrollable {
-                                ScrollView(showsIndicators: false) {
-                                    MomoText(description, typography: .bodyDefaultRegular)
-                                        .multilineTextAlignment(.leading)
-                                        .background(GeometryReader { geo in
-                                            Color.clear.onAppear { textHeight = geo.size.height }
-                                        })
-                                        .measureLineHeights(font: .body_default_regular,
-                                                            oneLine: $oneLineH,
-                                                            twoLines: $twoLineH)
-                                        .accessibility(identifier: "description_popup_permission")
-                                }
-                                // Cap the visible height to ~8.5 lines
-                                .frame(height: min(maxHeight8_5, textHeight))
-                            } else {
-                                MomoText(description, typography: .bodyDefaultRegular)
-                                    .multilineTextAlignment(.leading)
-                                    .background(GeometryReader { geo in
-                                        Color.clear.onAppear {
-                                            textHeight = geo.size.height
-                                            // Trigger scroll at ~8.5 lines
-                                            isScrollable = textHeight > maxHeight8_5
+                                Group {
+                                    if isScrollable {
+                                        ScrollView(showsIndicators: false) {
+                                            MomoText(description, typography: .bodyDefaultRegular)
+                                                .multilineTextAlignment(.leading)
+                                                .background(GeometryReader { geo in
+                                                    Color.clear.onAppear { textHeight = geo.size.height }
+                                                })
+                                                .measureLineHeights(font: .body_default_regular,
+                                                                    oneLine: $oneLineH,
+                                                                    twoLines: $twoLineH)
+                                                .accessibility(identifier: "description_popup_permission")
                                         }
-                                    })
-                                    .measureLineHeights(font: .body_default_regular,
-                                                        oneLine: $oneLineH,
-                                                        twoLines: $twoLineH)
-                                    .accessibility(identifier: "description_popup_permission")
-                            }
-                        }
-                        .padding(.bottom, 8)
-                        
-                        if(!errorCode.isEmpty) {
-                            MomoText(localize.translate("errorCode") + errorCode, typography: .descriptionXsRegular, color: Colors.black12)
-                                .lineLimit(1)
+                                        // Cap the visible height to ~8.5 lines
+                                        .frame(height: min(maxHeight8_5, textHeight))
+                                    } else {
+                                        MomoText(description, typography: .bodyDefaultRegular)
+                                            .multilineTextAlignment(.leading)
+                                            .background(GeometryReader { geo in
+                                                Color.clear.onAppear {
+                                                    textHeight = geo.size.height
+                                                    // Trigger scroll at ~8.5 lines
+                                                    isScrollable = textHeight > maxHeight8_5
+                                                }
+                                            })
+                                            .measureLineHeights(font: .body_default_regular,
+                                                                oneLine: $oneLineH,
+                                                                twoLines: $twoLineH)
+                                            .accessibility(identifier: "description_popup_permission")
+                                    }
+                                }
                                 .padding(.bottom, 8)
+                        
+                                if(!errorCode.isEmpty) {
+                                    MomoText(localize.translate("errorCode") + errorCode, typography: .descriptionXsRegular, color: Colors.black12)
+                                        .lineLimit(1)
+                                        .padding(.bottom, 8)
+                                }
+                            }
+                            .frame(maxWidth: .infinity, alignment: .leading)
+                            .padding(.horizontal, 24)
+                            .padding(.bottom, 16)
                         }
                     }
-                    .frame(maxWidth: .infinity, alignment: .leading)
-                    .padding(.horizontal, 24)
-                    .padding(.bottom, 16)
-                    
-                    if shouldUseColumn {
-                        if buttonType == .text {
-                            ColumnTextButtons
-                        } else {
-                            ColumnButtons
-                        }
-                    } else {
-                        if buttonType == .text {
-                            RowTextButtons
+
+                    Group {
+                        if shouldUseColumn {
+                            if buttonType == .text {
+                                ColumnTextButtons
+                            } else {
+                                ColumnButtons
+                            }
                         } else {
-                            RowButtons
+                            if buttonType == .text {
+                                RowTextButtons
+                            } else {
+                                RowButtons
+                            }
                         }
                     }
+                    .background(
+                        GeometryReader { proxy in
+                            Color.clear
+                                .onAppear { actionsHeight = proxy.size.height }
+                                .onChange(of: proxy.size.height) { actionsHeight = $0 }
+                        }
+                    )
                 }
                 .fixedSize(horizontal: false, vertical: true)
             }
         }
             .background(Color.white.cornerRadius(15))
-            .frame(maxWidth: popupMaxWidth - 24)
+            .frame(maxWidth: layout.popupMaxWidth)
             .padding(.horizontal, 12)
             .accessibilityElement(children: .ignore)
             .accessibility(identifier: "popup_notify")

package/ios/Popup/PopupLayout.swift

@@ -0,0 +1,45 @@
+import SwiftUI
+
+// Width of a system alert on the iPhone Duo inner display, in both orientations (RN Popup/utils.ts).
+private let duoPopupMaxWidth: CGFloat = 440
+
+extension ScreenLayout {
+    var isDuoDevice: Bool { isIPhoneDuoDevice(windowSize: CGSize(width: width, height: height)) }
+
+    /// Card width cap; other devices keep the full window width minus the popup's own padding.
+    var popupMaxWidth: CGFloat {
+        isDuoDevice ? min(width - Spacing.XL * 2, duoPopupMaxWidth) : .infinity
+    }
+
+    /// Room left for a popup on iPhone Duo, where landscape is too short for it; nil elsewhere.
+    var popupMaxHeight: CGFloat? {
+        guard isDuoDevice else { return nil }
+        return height - duoTopInset - insets.bottom - Spacing.XL * 2
+    }
+}
+
+/// Scrolls `content` once it is taller than `maxHeight`; otherwise sizes to it.
+struct PopupScrollBody<Content: View>: View {
+    let maxHeight: CGFloat?
+    @ViewBuilder let content: () -> Content
+
+    @State private var contentHeight: CGFloat = 0
+
+    var body: some View {
+        if let maxHeight {
+            ScrollView(.vertical, showsIndicators: false) {
+                content()
+                    .background(
+                        GeometryReader { proxy in
+                            Color.clear
+                                .onAppear { contentHeight = proxy.size.height }
+                                .onChange(of: proxy.size.height) { contentHeight = $0 }
+                        }
+                    )
+            }
+            .frame(height: min(contentHeight, max(maxHeight, 0)))
+        } else {
+            content()
+        }
+    }
+}

package/ios/Popup/PopupNotify.swift

@@ -3,12 +3,6 @@ import SwiftUI
 
 public typealias PopupActionDirection = PopupButtonDirection
 
-// Portrait width in landscape too, so aspect-ratio images don't push popups past the screen height.
-var popupMaxWidth: CGFloat {
-    let size = UIScreen.main.bounds.size
-    return min(size.width, size.height)
-}
-
 public struct PopupNotifyProps {
     public var image: String
     public var title: String
@@ -46,10 +40,12 @@ public struct PopupNotifyProps {
 public struct PopupNotify: View {
     @Environment(\.localize) private var localize
     @Environment(\.momoFontScale) private var fontScale
+    @Environment(\.screenLayout) private var layout
 
     public let props: PopupNotifyProps
 
     @State private var descriptionHeight: CGFloat = 0
+    @State private var actionsHeight: CGFloat = 0
 
     private var errorCodePrefix: String {
         localize.translate("errorCode")
@@ -77,37 +73,26 @@ public struct PopupNotify: View {
     public var body: some View {
         ZStack(alignment: .topTrailing) {
             VStack(spacing: 0) {
-                if !props.image.isEmpty {
-                    popupImage
-                }
-
-                VStack(alignment: .leading, spacing: 0) {
-                    MomoText(
-                        props.title,
-                        typography: .headerDefaultBold,
-                        maxLines: 2,
-                        accessibilityId: "title_popup_permission"
-                    )
-                    .padding(.bottom, Spacing.S)
-
-                    descriptionContent
-
-                    if !props.error.isEmpty {
-                        MomoText(
-                            errorCodePrefix + props.error,
-                            typography: .descriptionXsRegular,
-                            color: Colors.black12,
-                            maxLines: 1
-                        )
-                        .padding(.top, Spacing.S)
+                // scrolls when iPhone Duo landscape is too short; actions stay visible
+                PopupScrollBody(maxHeight: layout.popupMaxHeight.map { $0 - actionsHeight }) {
+                    VStack(spacing: 0) {
+                        if !props.image.isEmpty {
+                            popupImage
+                        }
+                        textContent
                     }
                 }
-                .frame(maxWidth: .infinity, alignment: .leading)
-                .padding(Spacing.XL)
 
                 actionButtons
                     .padding(.horizontal, Spacing.XL)
                     .padding(.bottom, Spacing.XL)
+                    .background(
+                        GeometryReader { proxy in
+                            Color.clear
+                                .onAppear { actionsHeight = proxy.size.height }
+                                .onChange(of: proxy.size.height) { actionsHeight = $0 }
+                        }
+                    )
             }
             .background(Colors.black01)
             .clipShape(RoundedRectangle(cornerRadius: Radius.L))
@@ -117,12 +102,38 @@ public struct PopupNotify: View {
                     .offset(x: 11, y: -11)
             }
         }
-        .frame(maxWidth: popupMaxWidth - Spacing.M * 2)
+        .frame(maxWidth: layout.popupMaxWidth)
         .padding(.horizontal, Spacing.M)
         .accessibilityElement(children: .ignore)
         .accessibilityIdentifier("popup_notify")
     }
 
+    private var textContent: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            MomoText(
+                props.title,
+                typography: .headerDefaultBold,
+                maxLines: 2,
+                accessibilityId: "title_popup_permission"
+            )
+            .padding(.bottom, Spacing.S)
+
+            descriptionContent
+
+            if !props.error.isEmpty {
+                MomoText(
+                    errorCodePrefix + props.error,
+                    typography: .descriptionXsRegular,
+                    color: Colors.black12,
+                    maxLines: 1
+                )
+                .padding(.top, Spacing.S)
+            }
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .padding(Spacing.XL)
+    }
+
     private var popupImage: some View {
         WebImage(url: URL(string: props.image), isAnimating: .constant(true))
             .resizable()

package/ios/Popup/PopupPromotion.swift

@@ -3,6 +3,7 @@ import SDWebImageSwiftUI
 
 public struct PopupPromotion: View {
     @Environment(\.appTheme) private var theme
+    @Environment(\.screenLayout) private var layout
 
     var imageUrl: String
     var onIconClose: (() -> Void)?
@@ -19,22 +20,33 @@ public struct PopupPromotion: View {
         self.onAction = onAction
     }
 
+    private static let aspectRatio: CGFloat = 0.72
+    // close button row under the image: stack spacing + padded 40pt button
+    private static let closeRowHeight: CGFloat = 8 + 40 + Spacing.S * 2
+
+    // fit the portrait image by height when iPhone Duo leaves too little room
+    private var imageWidth: CGFloat {
+        let width = min(layout.width - Spacing.XL * 2, layout.popupMaxWidth)
+        guard let maxHeight = layout.popupMaxHeight else { return width }
+        return min(width, (maxHeight - Self.closeRowHeight) * Self.aspectRatio)
+    }
+
     public var body: some View {
         VStack(spacing: 8) {
             if(imageUrl.isEmpty) {
-                Icon(source: "media_fail", size: popupMaxWidth - Spacing.XL * 2)
+                Icon(source: "media_fail", size: imageWidth)
             }
             else {
                 WebImage(url: URL(string: imageUrl))
                     .resizable()
                     .placeholder {
                         Color.gray
-                            .aspectRatio(0.72, contentMode: .fit)
-                            .frame(maxWidth: popupMaxWidth - Spacing.XL * 2)
+                            .aspectRatio(Self.aspectRatio, contentMode: .fit)
+                            .frame(maxWidth: imageWidth)
                             .clipped()
                     }
-                    .aspectRatio(0.72, contentMode: .fit)
-                    .frame(maxWidth: popupMaxWidth - Spacing.XL * 2, alignment: .center)
+                    .aspectRatio(Self.aspectRatio, contentMode: .fit)
+                    .frame(maxWidth: imageWidth, alignment: .center)
                     .clipped()
                     .onTapGesture {
                         onAction?()