Merge branch 'main' into fix/load_time_loader_controller

juspay · May 20, 2024 · 90ea1b2 · 90ea1b2
2 parents 543c946 + 9d259c2
commit 90ea1b2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/Payments/PreMountLoader.res b/src/Payments/PreMountLoader.res
@@ -96,6 +96,7 @@ let make = (~sessionId, ~publishableKey, ~clientSecret, ~endpoint) => {
     if (
       paymentMethodsResponseSent && customerPaymentMethodsResponseSent && sessionTokensResponseSent
     ) {
+      handlePostMessage([("preMountLoaderIframeUnMount", true->JSON.Encode.bool)])
       Window.removeEventListener("message", handle)
     }
     None

diff --git a/src/orca-loader/Elements.res b/src/orca-loader/Elements.res
@@ -90,12 +90,21 @@ let make = (
 
     let preMountLoaderIframeDiv = mountPreMountLoaderIframe()
 
+    let unMountPreMountLoaderIframe = () => {
+      switch preMountLoaderIframeDiv->Nullable.toOption {
+      | Some(iframe) => iframe->remove
+      | None => ()
+      }
+    }
+
     let preMountLoaderMountedPromise = Promise.make((resolve, _reject) => {
       let preMountLoaderIframeCallback = (ev: Types.event) => {
         let json = ev.data->Identity.anyTypeToJson
         let dict = json->getDictFromJson
         if dict->Dict.get("preMountLoaderIframeMountedCallback")->Option.isSome {
           resolve(true->JSON.Encode.bool)
+        } else if dict->Dict.get("preMountLoaderIframeUnMount")->Option.isSome {
+          unMountPreMountLoaderIframe()
         }
       }
       addSmartEventListener(
-Original file line number
+Diff line change
@@ Expand Up @@
         if (
           paymentMethodsResponseSent && customerPaymentMethodsResponseSent && sessionTokensResponseSent
         ) {
+          handlePostMessage([("preMountLoaderIframeUnMount", true->JSON.Encode.bool)])
           Window.removeEventListener("message", handle)
         }
         None
@@ Expand Down @@