react-native-firework-sdk 2.2.4 → 2.3.0

package/ios/FireworkVideoUI/FireworkVideoUI/Sources/AppLanguage/Extensions/Foundation/URLSession+AppLanguage.swift

@@ -6,11 +6,6 @@
 
 import Foundation
 
-private var FWHostList: [String] = [
-    "api.firework.tv",
-    "p2.fwpixel.com"
-]
-
 extension URLSession {
     static func swizzleURLSessionMethodsForAppLanguage() {
         // swiftlint:disable:next line_length
@@ -41,20 +36,8 @@ extension URLSession {
     }
 
     private func swizzleRequest(_ request: URLRequest) -> URLRequest {
-        var host = ""
-        #if compiler(>=5.7)
-        if #available(iOS 16, *) {
-            host = request.url?.host() ?? ""
-        } else {
-            host = request.url?.host ?? ""
-        }
-        #else
-        host = request.url?.host ?? ""
-        #endif
-
         if let language = AppLanguageManager.shared.appLanguage,
-           let languageCode = AppLanguageManager.shared.appLanguageCode,
-           FWHostList.contains(host) {
+           let languageCode = AppLanguageManager.shared.appLanguageCode {
             var mutableRequest = request
             if language != languageCode {
                 mutableRequest.setValue("\(language),\(languageCode);q=0.9", forHTTPHeaderField: "Accept-Language")

package/ios/FireworkVideoUI/FireworkVideoUI/Sources/AppLanguage/Extensions/UIKit/UIImageView+AppLanguage.swift

@@ -12,7 +12,10 @@ private let FWImageNamesWithDirections: [String] = [
     "left-arrow",
     "right-arrow",
     "speaker-unmute",
-    "speaker-mute"
+    "speaker-mute",
+    "mute",
+    "mute-off",
+    "mute-on"
 ]
 
 extension UIImageView {

package/ios/Models/NativeToRN/FireworkEventName.swift

@@ -39,7 +39,6 @@ enum VideoPlaybackSubEventName: String {
 /// Shopping event
 enum ShoppingEventName: String, CaseIterable {
     case updateProductDetails = "fw:shopping:update-product-details"
-    case willDisplayProduct = "fw:shopping:will-display-product"
     case ctaButtonClick = "fw:shopping:cta-button-click"
     case clickCartIcon = "fw:shopping:click-cart-icon"
     case logMessage = "fw:log-message"

package/ios/Models/NativeToRN/FireworkSDK+Json.swift

@@ -38,7 +38,7 @@ extension VideoPlaybackDetails {
             "progress": progress,
             "ctaActionType": ctaActionType ?? "",
             "ctaActionURL": ctaActionURL ?? "",
-            "feedId": feedId ?? "",
+            "feedId": feedId ?? ""
         ]
     }
 }

package/ios/Modules/FWNavigatorModule/FWNavigatorModule.swift

@@ -7,19 +7,6 @@
 
 import FireworkVideo
 
-private let FWExitButtonImageNames: [String] = [
-    "closeX",
-    "down-arrow-light"
-]
-
-private struct PlayerInfo {
-    enum PlayerMode: Int {
-        case fullscreen, floating
-    }
-    var playerVC: PlayerViewController
-    var mode: PlayerMode
-}
-
 private struct PlayerExitButtonInfo {
     enum ExitButtonType: Int {
         case close, floating
@@ -29,7 +16,7 @@ private struct PlayerExitButtonInfo {
 }
 
 @objc(FWNavigatorModule)
-class FWNavigatorModule: RCTEventEmitter, FWNavigator {
+class FWNavigatorModule: RCTEventEmitter {
     override func supportedEvents() -> [String]! {
         return [FWEventName.logMessage.rawValue]
     }
@@ -42,112 +29,15 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
         return DispatchQueue.main
     }
 
-    // swiftlint:disable function_body_length
-
-    @objc(pushNativeContainer:resolver:rejecter:)
-    func pushNativeContainer(
-        _ props: NSDictionary?, resolver: @escaping RCTPromiseResolveBlock,
-        rejecter: @escaping RCTPromiseRejectBlock
-    ) {
-        #if DEBUG
-            let formatter = DateFormatter()
-            formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
-            sendEvent(
-                withName: FWEventName.logMessage.rawValue,
-                body: [
-                    "message": "[iOS] Enter pushNativeContainer \(formatter.string(from: Date()))"
-                ])
-        #endif
-
-        guard let props = props as? [String: Any] else {
-            resolver(false)
-            return
-        }
-
-        guard let appComponentName = gAppComponentName, appComponentName.count > 0 else {
-            resolver(false)
-            return
-        }
-
-        guard let presentedVC = RCTPresentedViewController() else {
-            resolver(false)
-            return
-        }
-
-        #if DEBUG
-            self.sendEvent(
-                withName: FWEventName.logMessage.rawValue,
-                body: [
-                    "message":
-                        "[iOS] Before creating containerViewController \(formatter.string(from: Date()))"
-                ])
-        #endif
-
-        let containerViewController = FWNavigatorContainerViewController()
-
-        #if DEBUG
-            self.sendEvent(
-                withName: FWEventName.logMessage.rawValue,
-                body: [
-                    "message":
-                        "[iOS] After creating containerViewController \(formatter.string(from: Date()))"
-                ])
-        #endif
-
-        containerViewController.moduleName = appComponentName
-        containerViewController.properties = props
-        containerViewController.modalPresentationStyle = .fullScreen
-        if presentedVC.modalPresentationStyle == .custom,
-            let presentingVC = presentedVC.presentingViewController,
-            presentingVC is FireworkVideo.PlayerViewController
-        {
-            containerViewController.modalPresentationStyle = .overFullScreen
-        }
-
-        #if DEBUG
-            self.sendEvent(
-                withName: FWEventName.logMessage.rawValue,
-                body: [
-                    "message":
-                        "[iOS] Present containerViewController \(formatter.string(from: Date()))"
-                ])
-        #endif
-
-        presentedVC.present(containerViewController, animated: true) {
-            #if DEBUG
-                self.sendEvent(
-                    withName: FWEventName.logMessage.rawValue,
-                    body: [
-                        "message":
-                            "[iOS] Finish presenting containerViewController \(formatter.string(from: Date()))"
-                    ])
-            #endif
-
-            resolver(true)
-        }
-    }
-
-    // swiftlint:enable function_body_length
-
     @objc(popNativeContainer:rejecter:)
     func popNativeContainer(
         _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock
     ) {
-        if let navigatorContainerVC = RCTPresentedViewController()
-            as? FWNavigatorContainerViewController,
-            navigatorContainerVC.presentingViewController != nil {
-            navigatorContainerVC.dismiss(animated: true) {
-                resolver(true)
-            }
-        } else if let cartViewController = gCartViewController {
-            cartViewController.navigationController?.popViewController(animated: true)
-            gCartViewController = nil
-            resolver(true)
-        } else if let presentedVC = RCTPresentedViewController(),
-                  FWNavigatorModule.isIOSSDKViewController(presentedVC),
-                  let presentingVC = presentedVC.presentingViewController,
-                  presentingVC.presentingViewController == RCTKeyWindow()?.rootViewController,
-                  FWNavigatorModule.isIOSSDKViewController(presentingVC) {
+        if let presentedVC = RCTPresentedViewController(),
+           FWNavigatorModule.isIOSSDKViewController(presentedVC),
+           let presentingVC = presentedVC.presentingViewController,
+           presentingVC.presentingViewController == RCTKeyWindow()?.rootViewController,
+           FWNavigatorModule.isIOSSDKViewController(presentingVC) {
             presentedVC.dismiss(animated: false) {
                 DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.1) {
                     if let buttonInfo = FWNavigatorModule.getPlayerExitButtonInfo(view: presentingVC.view) {
@@ -184,47 +74,6 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
         }
     }
 
-    @objc(canPopNativeContainer:rejecter:)
-    func canPopNativeContainer(
-        _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock
-    ) {
-        if let navigatorContainerVC = RCTPresentedViewController()
-            as? FWNavigatorContainerViewController,
-            navigatorContainerVC.presentingViewController != nil {
-            resolver(true)
-        } else if gCartViewController != nil {
-            resolver(true)
-        } else if let presentedVC = RCTPresentedViewController(),
-                  FWNavigatorModule.isIOSSDKViewController(presentedVC),
-                  let presentingVC = presentedVC.presentingViewController,
-                  presentingVC.presentingViewController == RCTKeyWindow()?.rootViewController,
-                  FWNavigatorModule.isIOSSDKViewController(presentingVC) {
-            if let buttonInfo = FWNavigatorModule.getPlayerExitButtonInfo(view: presentingVC.view) {
-                if buttonInfo.type == .close {
-                    resolver(true)
-                } else {
-                    resolver(false)
-                }
-            } else {
-                resolver(true)
-            }
-        } else if let rootVC = RCTKeyWindow()?.rootViewController,
-                    let presentedVC = rootVC.presentedViewController,
-                  FWNavigatorModule.isIOSSDKViewController(presentedVC) {
-            if let buttonInfo = FWNavigatorModule.getPlayerExitButtonInfo(view: presentedVC.view) {
-                if buttonInfo.type == .close {
-                    resolver(true)
-                } else {
-                    resolver(false)
-                }
-            } else {
-                resolver(true)
-            }
-        } else {
-            resolver(false)
-        }
-    }
-
     @objc(startFloatingPlayer:rejecter:)
     func startFloatingPlayer(
         _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock

package/ios/Modules/FireworkSDKModule/FireworkSDKModule+CTA.swift

@@ -23,26 +23,6 @@ extension FireworkSDKModule: FireworkVideoCTADelegate {
 
         sendEvent(withName: FWEventName.customCTAClick.rawValue, body: ["url": url.absoluteString])
 
-        var customCTALinkContentPageEnabled = false
-        if let moduleName = gAppComponentName,
-            moduleName.count > 0,
-            let initialRouteName = customCTALinkContentPageRouteName,
-            initialRouteName.count > 0,
-            let presentedVC = RCTPresentedViewController()
-        {
-            customCTALinkContentPageEnabled = true
-            let containerViewController = FWNavigatorContainerViewController()
-            containerViewController.moduleName = moduleName
-            containerViewController.properties = [
-                "initialRouteName": initialRouteName,
-                "initialParams": ["url": url.absoluteString]
-            ]
-            containerViewController.modalPresentationStyle = .fullScreen
-            presentedVC.present(containerViewController, animated: true) {
-
-            }
-        }
-
-        return customCTAClickEnabled || customCTALinkContentPageEnabled
+        return customCTAClickEnabled
     }
 }

package/ios/Modules/FireworkSDKModule/FireworkSDKModule.m

@@ -10,14 +10,13 @@
 
 @interface RCT_EXTERN_REMAP_MODULE(FireworkSDK, FireworkSDKModule, NSObject)
 
-_RCT_EXTERN_REMAP_METHOD(init, initializeSDK:(NSDictionary * __nullable)options resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter, NO)
+_RCT_EXTERN_REMAP_METHOD(init, initializeSDK:(NSDictionary * __nullable)options resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter, NO)
 RCT_EXTERN_METHOD(openVideoPlayer:(NSString *)url config:(NSDictionary *)config)
 RCT_EXTERN_METHOD(setCustomCTAClickEnabled:(BOOL)enabled)
 RCT_EXTERN_METHOD(setCustomCTALinkContentPageRouteName:(NSString *)name resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(setShareBaseURL:(NSString *)url resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(setVideoPlaybackEventEnabled:(BOOL)enabled)
 RCT_EXTERN_METHOD(setAdBadgeConfiguration:(NSDictionary *)config resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
-RCT_EXTERN_METHOD(setAppComponentName:(NSString *)name resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(trackPurchase:(NSDictionary *)parameters)
 RCT_EXTERN_METHOD(changeAppLanguage:(NSString * __nullable)language resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 

package/ios/Modules/FireworkSDKModule/FireworkSDKModule.swift

@@ -13,7 +13,6 @@ import FireworkVideoUI
 
 var gShareBaseURL: String?
 var gAdBadgeConfiguration: AdBadgeConfiguration?
-var gAppComponentName: String?
 var gVideoLaunchBehavior: VideoLaunchBehavior?
 
 @objc(FireworkSDKModule)
@@ -30,7 +29,7 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
         super.init()
         _ = AppLanguageManager.shared
         NotificationCenter.default.addObserver(
-            self, selector: #selector(FireworkSDKModule.onAppLanguageChanged),
+            self, selector: #selector(Self.onAppLanguageChanged),
             name: AppLanguageManager.NotificationName.AppLanguageChanged, object: nil)
     }
 
@@ -104,8 +103,6 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
             return
         }
 
-        _ = AppLanguageManager.shared
-
         VideoFeedViewController.openVideoPlayer(with: urlString, feedContentConfig, presentedVC) { _ in
 
         }
@@ -146,14 +143,6 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
         resolver([:])
     }
 
-    @objc(setAppComponentName:resolver:rejecter:)
-    func setAppComponentName(
-        _ name: String, resolver: RCTPromiseResolveBlock, rejecter: RCTPromiseRejectBlock
-    ) {
-        gAppComponentName = name
-        resolver([:])
-    }
-
     @objc(trackPurchase:)
     func trackPurchase(_ parameters: [String: AnyObject]?) {
         guard let trackPurchaseParameters = RCTConvert.trackPurchaseParameters(parameters) else {

package/ios/Modules/LiveStream/LiveStreamModule.m

@@ -9,6 +9,6 @@
 
 @interface RCT_EXTERN_REMAP_MODULE(LiveStreamModule, LiveStreamModule, NSObject)
 
-_RCT_EXTERN_REMAP_METHOD(init, initializeSDK, NO)
+_RCT_EXTERN_REMAP_METHOD(init, initializeSDK:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter, NO)
 
 @end

package/ios/Modules/LiveStream/LiveStreamModule.swift

@@ -23,9 +23,11 @@ class LiveStreamModule: RCTEventEmitter, FireworkLiveStreamEventDelegate {
         return DispatchQueue.main
     }
 
-    @objc
-    func initializeSDK() {
+    @objc(initializeSDK:rejecter:)
+    func initializeSDK(_ resolver: RCTPromiseResolveBlock,
+                       rejecter: RCTPromiseRejectBlock) {
         FireworkVideoSDK.eventTracking.liveStreamEventDelegate = self
+        resolver([:])
     }
 
     func fireworkLiveStreamUserDidJoin(_ liveStream: LiveStreamEventDetails) {

package/ios/Modules/Shopping/FWCartViewController.swift

@@ -10,80 +10,5 @@ import UIKit
 
 @objc(FWCartViewController)
 public class FWCartViewController: UIViewController, CartViewRepresentable {
-    var callbackId: Int!
-    @objc public var enableShowCustomCartView: Bool = true
-    private var properties: [String: Any] = [:]
-    private var directShowCartPage = false
 
-    init(callbackId: Int, enableShowCustomCartView: Bool) {
-        self.callbackId = callbackId
-        self.enableShowCustomCartView = enableShowCustomCartView
-        super.init(nibName: nil, bundle: nil)
-        if enableShowCustomCartView {
-            NotificationCenter.default.addObserver(
-                self, selector: #selector(showCustomCartView(_:)),
-                name: Notification.Name(rawValue: "showCustomCartView"), object: nil)
-        }
-    }
-
-    required init?(coder: NSCoder) {
-        super.init(coder: coder)
-    }
-
-    public override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        if enableShowCustomCartView {
-            self.navigationController?.setNavigationBarHidden(true, animated: true)
-        }
-    }
-
-    public override func viewDidLoad() {
-        super.viewDidLoad()
-
-        if directShowCartPage && enableShowCustomCartView {
-            directShowCustomCartView()
-        }
-    }
-
-    public override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        if enableShowCustomCartView {
-            self.navigationController?.setNavigationBarHidden(false, animated: true)
-        }
-    }
-
-    @objc func showCustomCartView(_ noti: NSNotification) {
-        guard let cbId = noti.userInfo?["cbId"] as? Int, callbackId == cbId else {
-            return
-        }
-
-        if let properties = noti.userInfo?["properties"] as? [String: Any] {
-            self.properties = properties
-        }
-
-        if isViewLoaded {
-            directShowCustomCartView()
-        } else {
-            directShowCartPage = true
-        }
-    }
-
-    private func directShowCustomCartView() {
-        guard let appComponentName = gAppComponentName, appComponentName.count > 0 else {
-            return
-        }
-        let rctRootView = RCTRootView.init(
-            bridge: RCTBridge.current(),
-            moduleName: appComponentName,
-            initialProperties: properties)
-        view.addSubview(rctRootView)
-        rctRootView.translatesAutoresizingMaskIntoConstraints = false
-
-        NSLayoutConstraint.activate([
-            rctRootView.leftAnchor.constraint(equalTo: view.leftAnchor),
-            rctRootView.topAnchor.constraint(equalTo: view.topAnchor),
-            rctRootView.rightAnchor.constraint(equalTo: view.rightAnchor),
-            rctRootView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
-        ])
-    }
 }

package/ios/Modules/Shopping/ShoppingModule.m

@@ -9,12 +9,10 @@
 
 @interface RCT_EXTERN_REMAP_MODULE(ShoppingModule, ShoppingModule, NSObject)
 
-_RCT_EXTERN_REMAP_METHOD(init, initializeSDK, NO)
+_RCT_EXTERN_REMAP_METHOD(init, initializeSDK:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter, NO)
 RCT_EXTERN_METHOD(setCartIconVisible:(BOOL)visible)
 RCT_EXTERN_METHOD(setCartItemCount:(int)itemCounts)
 RCT_EXTERN_METHOD(updateVideoProducts:(NSArray *)products cbId:(nonnull NSNumber *)cbId)
-RCT_EXTERN_METHOD(jumpToCartPage:(nonnull NSNumber *)cbId props:(NSDictionary *)props)
-RCT_EXTERN_METHOD(setCustomClickCartIconEnabled:(BOOL)enabled resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(setProductInfoViewConfiguration:(NSDictionary *)config)
 RCT_EXTERN_METHOD(clearCallbackId:(nonnull NSNumber *)cbId eventName:(nonnull NSString *)name)
 RCT_EXTERN_METHOD(setCustomClickLinkButtonEnabled:(BOOL)enabled resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)

package/ios/Modules/Shopping/ShoppingModule.swift

@@ -5,13 +5,11 @@
 //  Created by Jeff Zheng on 2021/12/30.
 //
 
+// swiftlint:disable file_length
+
 import FireworkVideo
 import Foundation
 
-weak var gCartViewController: FWCartViewController?
-
-// swiftlint:disable file_length type_body_length
-
 @objc(ShoppingModule)
 class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewControllerProviding {
 
@@ -19,10 +17,8 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
     private var shoppingCTAHandlerMap: [Int: ShoppingCTAHandler] = [:]
     private var productHydratingMap: [Int: ProductHydrating] = [:]
 
-    private var cartViewController: FWCartViewController?
-    private var cartIconVisible = true
+    private var cartIconVisible: Bool?
     private var itemCounts = 0
-    private var customClickCartIconEnabled = false
     private var productInfoViewConfiguration: ProductInfoViewConfiguration?
     private var customClickLinkButtonEnabled = false
 
@@ -47,10 +43,12 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
         return CBIdIncreasingFactor.callbackId
     }
 
-    @objc
-    func initializeSDK() {
+    @objc(initializeSDK:rejecter:)
+    func initializeSDK(_ resolver: RCTPromiseResolveBlock,
+                       rejecter: RCTPromiseRejectBlock) {
         FireworkVideoSDK.shopping.shoppingDelegate = self
         FireworkVideoSDK.shopping.cartViewControllerProvider = self
+        resolver([:])
     }
 
     @objc
@@ -133,27 +131,6 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
         }
     }
 
-    @objc
-    func jumpToCartPage(_ cbId: NSNumber, props: NSDictionary) {
-        let properties: [String: Any] = (props as? [String: Any]) ?? [:]
-        let noti = Notification(
-            name: Notification.Name(rawValue: "showCustomCartView"), object: nil,
-            userInfo: [
-                "cbId": Int(truncating: cbId),
-                "properties": properties
-            ])
-        NotificationCenter.default.post(noti)
-    }
-
-    @objc
-    func setCustomClickCartIconEnabled(
-        _ enabled: Bool, resolver: @escaping RCTPromiseResolveBlock,
-        rejecter: @escaping RCTPromiseRejectBlock
-    ) {
-        customClickCartIconEnabled = enabled
-        resolver([:])
-    }
-
     @objc
     func setProductInfoViewConfiguration(_ config: [String: Any]?) {
         let config = RCTConvert.buildProductInfoViewConfiguration(config)
@@ -229,7 +206,9 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
     ) {
         let callbackId = ShoppingModule.generateCallbackId()
         self.productInfoViewConfigurator = (callbackId, productInfoViewConfigurator)
-        productInfoViewConfigurator.shoppingCartIconConfiguration.isHidden = !self.cartIconVisible
+        if let cartIconVisible = self.cartIconVisible {
+            productInfoViewConfigurator.shoppingCartIconConfiguration.isHidden = !cartIconVisible
+        }
         productInfoViewConfigurator.shoppingCartIconConfiguration.indicator.isHidden = itemCounts == 0
 
         if let productInfoViewConfiguration = productInfoViewConfiguration {
@@ -248,10 +227,6 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
                 withName: FWEventName.logMessage.rawValue,
                 body: ["message": message])
         #endif
-
-        sendEvent(
-            withName: ShoppingEventName.willDisplayProduct.rawValue,
-            body: ["videoId": video.videoID, "callbackId": callbackId])
     }
 
     func fireworkShopping(
@@ -318,19 +293,9 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
 
     // MARK: - CartViewControllerProviding
     func cartViewController(for video: VideoDetails) -> FireworkVideo.CartViewController {
-        let callbackId = ShoppingModule.generateCallbackId()
         sendEvent(
-            withName: ShoppingEventName.clickCartIcon.rawValue, body: ["callbackId": callbackId])
-
-        let cartVC = FWCartViewController(
-            callbackId: callbackId,
-            enableShowCustomCartView: !customClickCartIconEnabled)
-        if !customClickCartIconEnabled {
-            gCartViewController = cartVC
-        } else {
-            gCartViewController = nil
-        }
-        return cartVC
+            withName: ShoppingEventName.clickCartIcon.rawValue, body: [:])
+        return FWCartViewController()
     }
 }
 

package/ios/Utils/Extensions/Swizzle/UINavigationController+FWSwizzle.swift

@@ -22,7 +22,7 @@ extension UINavigationController {
         _ viewController: UIViewController,
         animated: Bool
     ) {
-        if let cartVC = viewController as? FWCartViewController, !cartVC.enableShowCustomCartView {
+        if viewController is FWCartViewController {
             return
         }