@imtbl/sdk 1.31.1-alpha.1 → 1.31.1-alpha.2

package/dist/index.cjs

@@ -183,7 +183,7 @@ const flattenProperties$1 = (properties) => {
 };
 
 // WARNING: DO NOT CHANGE THE STRING BELOW. IT GETS REPLACED AT BUILD TIME.
-const SDK_VERSION$1 = '1.31.1-alpha.1';
+const SDK_VERSION$1 = '1.31.1-alpha.2';
 const getFrameParentDomain$1 = () => {
     if (isNode$1()) {
         return '';
@@ -14194,7 +14194,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$2 = { 'x-sdk-version': 'ts-immutable-sdk-1.31.1-alpha.1' };
+const defaultHeaders$2 = { 'x-sdk-version': 'ts-immutable-sdk-1.31.1-alpha.2' };
 const createConfig$1 = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -14266,7 +14266,7 @@ class APIError extends Error {
 
 /* eslint-disable implicit-arrow-linebreak */
 const defaultHeaders$1 = {
-    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-1.31.1-alpha.1',
+    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-1.31.1-alpha.2',
 };
 /**
  * createAPIConfiguration to create a custom Configuration
@@ -14740,7 +14740,7 @@ var blockchain_data = /*#__PURE__*/Object.freeze({
 /* eslint-disable @typescript-eslint/naming-convention */
 class ApiConfiguration extends index$2.Configuration {
 }
-const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-1.31.1-alpha.1' };
+const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-1.31.1-alpha.2' };
 /**
  * @dev use createImmutableXConfiguration instead
  */
@@ -14779,7 +14779,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-1.31.1-alpha.1',
+    sdkVersion: 'ts-immutable-sdk-1.31.1-alpha.2',
     baseConfig,
 });
 const production = ({ baseConfig }) => createImmutableXConfiguration({
@@ -26324,7 +26324,7 @@ const getBlockedContents = () => `
   `;
 const getGenericContents = () => `
     <p style="color: #b6b6b6; text-align: center; margin: 0">
-      Secure pop-up didn't open?<br />We'll help you re-launch
+      Secure pop-up not showing?<br />We'll help you re-launch
     </p>
   `;
 const getTryAgainButton = () => `
@@ -26462,6 +26462,8 @@ class ConfirmationScreen {
     confirmationWindow;
     popupOptions;
     overlay;
+    overlayClosed = false;
+    timer;
     constructor(config) {
         this.config = config;
     }
@@ -26572,7 +26574,6 @@ class ConfirmationScreen {
         }
         this.popupOptions = popupOptions;
         try {
-            // confirmationWindow need to call close on in try again, then reopen
             this.confirmationWindow = openPopupCenter({
                 url: this.getHref('loading'),
                 title: CONFIRMATION_WINDOW_TITLE,
@@ -26585,7 +26586,21 @@ class ConfirmationScreen {
             // If an error is thrown here then the popup is blocked
             this.overlay = new Overlay(this.config.popupOverlayOptions, true);
         }
-        this.overlay.append(() => this.recreateConfirmationWindow(this.getHref('loading')), () => this.closeWindow());
+        this.overlay.append(() => {
+            try {
+                this.confirmationWindow?.close();
+                this.confirmationWindow = openPopupCenter({
+                    url: this.getHref('loading'),
+                    title: CONFIRMATION_WINDOW_TITLE,
+                    width: this.popupOptions?.width || CONFIRMATION_WINDOW_WIDTH,
+                    height: this.popupOptions?.height || CONFIRMATION_WINDOW_HEIGHT,
+                });
+            }
+            catch { /* Empty */ }
+        }, () => {
+            this.overlayClosed = true;
+            this.closeWindow();
+        });
     }
     closeWindow() {
         this.confirmationWindow?.close();
@@ -26595,32 +26610,40 @@ class ConfirmationScreen {
     showConfirmationScreen(href, messageHandler, resolve) {
         // If popup blocked, the confirmation window will not exist
         if (this.confirmationWindow) {
-            this.confirmationWindow.location.href = href; // update confirmation window before calling close on old window
+            this.confirmationWindow.location.href = href;
         }
         // This indicates the user closed the overlay so the transaction should be rejected
         if (!this.overlay) {
+            this.overlayClosed = false;
             resolve({ confirmed: false });
             return;
         }
-        this.overlay.update(() => this.recreateConfirmationWindow(href));
         // https://stackoverflow.com/questions/9388380/capture-the-close-event-of-popup-window-in-javascript/48240128#48240128
-        const timer = setInterval(() => {
-            if (this.confirmationWindow?.closed) {
-                clearInterval(timer);
+        const timerCallback = () => {
+            if (this.confirmationWindow?.closed || this.overlayClosed) {
+                clearInterval(this.timer);
                 window.removeEventListener('message', messageHandler);
                 resolve({ confirmed: false });
+                this.overlayClosed = false;
                 this.confirmationWindow = undefined;
             }
-        }, CONFIRMATION_WINDOW_CLOSED_POLLING_DURATION);
+        };
+        this.timer = setInterval(timerCallback, CONFIRMATION_WINDOW_CLOSED_POLLING_DURATION);
+        this.overlay.update(() => this.recreateConfirmationWindow(href, timerCallback));
     }
-    recreateConfirmationWindow(href) {
+    recreateConfirmationWindow(href, timerCallback) {
         try {
+            // Clears and recreates the timer to ensure when the confirmation window
+            // is closed and recreated the transaction is not rejected.
+            clearInterval(this.timer);
+            this.confirmationWindow?.close();
             this.confirmationWindow = openPopupCenter({
                 url: href,
                 title: CONFIRMATION_WINDOW_TITLE,
                 width: this.popupOptions?.width || CONFIRMATION_WINDOW_WIDTH,
                 height: this.popupOptions?.height || CONFIRMATION_WINDOW_HEIGHT,
             });
+            this.timer = setInterval(timerCallback, CONFIRMATION_WINDOW_CLOSED_POLLING_DURATION);
         }
         catch { /* Empty */ }
     }
@@ -57903,7 +57926,7 @@ const flattenProperties = (properties) => {
 };
 
 // WARNING: DO NOT CHANGE THE STRING BELOW. IT GETS REPLACED AT BUILD TIME.
-const SDK_VERSION = '1.31.1-alpha.1';
+const SDK_VERSION = '1.31.1-alpha.2';
 const getFrameParentDomain = () => {
     if (isNode()) {
         return '';
@@ -63125,7 +63148,7 @@ const IMMUTABLE_ZKVEM_GAS_OVERRIDES = {
     maxPriorityFeePerGas: ethers.BigNumber.from(10e9),
 };
 
-const SDK_VERSION_MARKER = '1.31.1-alpha.1';
+const SDK_VERSION_MARKER = '1.31.1-alpha.2';
 // This SDK version is replaced by the `yarn build` command ran on the root level
 const globalPackageVersion = () => SDK_VERSION_MARKER;
 

package/dist/index.js

@@ -160,7 +160,7 @@ const flattenProperties$1 = (properties) => {
 };
 
 // WARNING: DO NOT CHANGE THE STRING BELOW. IT GETS REPLACED AT BUILD TIME.
-const SDK_VERSION$1 = '1.31.1-alpha.1';
+const SDK_VERSION$1 = '1.31.1-alpha.2';
 const getFrameParentDomain$1 = () => {
     if (isNode$1()) {
         return '';
@@ -14171,7 +14171,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$2 = { 'x-sdk-version': 'ts-immutable-sdk-1.31.1-alpha.1' };
+const defaultHeaders$2 = { 'x-sdk-version': 'ts-immutable-sdk-1.31.1-alpha.2' };
 const createConfig$1 = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -14243,7 +14243,7 @@ class APIError extends Error {
 
 /* eslint-disable implicit-arrow-linebreak */
 const defaultHeaders$1 = {
-    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-1.31.1-alpha.1',
+    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-1.31.1-alpha.2',
 };
 /**
  * createAPIConfiguration to create a custom Configuration
@@ -14717,7 +14717,7 @@ var blockchain_data = /*#__PURE__*/Object.freeze({
 /* eslint-disable @typescript-eslint/naming-convention */
 class ApiConfiguration extends index$2.Configuration {
 }
-const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-1.31.1-alpha.1' };
+const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-1.31.1-alpha.2' };
 /**
  * @dev use createImmutableXConfiguration instead
  */
@@ -14756,7 +14756,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-1.31.1-alpha.1',
+    sdkVersion: 'ts-immutable-sdk-1.31.1-alpha.2',
     baseConfig,
 });
 const production = ({ baseConfig }) => createImmutableXConfiguration({
@@ -26301,7 +26301,7 @@ const getBlockedContents = () => `
   `;
 const getGenericContents = () => `
     <p style="color: #b6b6b6; text-align: center; margin: 0">
-      Secure pop-up didn't open?<br />We'll help you re-launch
+      Secure pop-up not showing?<br />We'll help you re-launch
     </p>
   `;
 const getTryAgainButton = () => `
@@ -26439,6 +26439,8 @@ class ConfirmationScreen {
     confirmationWindow;
     popupOptions;
     overlay;
+    overlayClosed = false;
+    timer;
     constructor(config) {
         this.config = config;
     }
@@ -26549,7 +26551,6 @@ class ConfirmationScreen {
         }
         this.popupOptions = popupOptions;
         try {
-            // confirmationWindow need to call close on in try again, then reopen
             this.confirmationWindow = openPopupCenter({
                 url: this.getHref('loading'),
                 title: CONFIRMATION_WINDOW_TITLE,
@@ -26562,7 +26563,21 @@ class ConfirmationScreen {
             // If an error is thrown here then the popup is blocked
             this.overlay = new Overlay(this.config.popupOverlayOptions, true);
         }
-        this.overlay.append(() => this.recreateConfirmationWindow(this.getHref('loading')), () => this.closeWindow());
+        this.overlay.append(() => {
+            try {
+                this.confirmationWindow?.close();
+                this.confirmationWindow = openPopupCenter({
+                    url: this.getHref('loading'),
+                    title: CONFIRMATION_WINDOW_TITLE,
+                    width: this.popupOptions?.width || CONFIRMATION_WINDOW_WIDTH,
+                    height: this.popupOptions?.height || CONFIRMATION_WINDOW_HEIGHT,
+                });
+            }
+            catch { /* Empty */ }
+        }, () => {
+            this.overlayClosed = true;
+            this.closeWindow();
+        });
     }
     closeWindow() {
         this.confirmationWindow?.close();
@@ -26572,32 +26587,40 @@ class ConfirmationScreen {
     showConfirmationScreen(href, messageHandler, resolve) {
         // If popup blocked, the confirmation window will not exist
         if (this.confirmationWindow) {
-            this.confirmationWindow.location.href = href; // update confirmation window before calling close on old window
+            this.confirmationWindow.location.href = href;
         }
         // This indicates the user closed the overlay so the transaction should be rejected
         if (!this.overlay) {
+            this.overlayClosed = false;
             resolve({ confirmed: false });
             return;
         }
-        this.overlay.update(() => this.recreateConfirmationWindow(href));
         // https://stackoverflow.com/questions/9388380/capture-the-close-event-of-popup-window-in-javascript/48240128#48240128
-        const timer = setInterval(() => {
-            if (this.confirmationWindow?.closed) {
-                clearInterval(timer);
+        const timerCallback = () => {
+            if (this.confirmationWindow?.closed || this.overlayClosed) {
+                clearInterval(this.timer);
                 window.removeEventListener('message', messageHandler);
                 resolve({ confirmed: false });
+                this.overlayClosed = false;
                 this.confirmationWindow = undefined;
             }
-        }, CONFIRMATION_WINDOW_CLOSED_POLLING_DURATION);
+        };
+        this.timer = setInterval(timerCallback, CONFIRMATION_WINDOW_CLOSED_POLLING_DURATION);
+        this.overlay.update(() => this.recreateConfirmationWindow(href, timerCallback));
     }
-    recreateConfirmationWindow(href) {
+    recreateConfirmationWindow(href, timerCallback) {
         try {
+            // Clears and recreates the timer to ensure when the confirmation window
+            // is closed and recreated the transaction is not rejected.
+            clearInterval(this.timer);
+            this.confirmationWindow?.close();
             this.confirmationWindow = openPopupCenter({
                 url: href,
                 title: CONFIRMATION_WINDOW_TITLE,
                 width: this.popupOptions?.width || CONFIRMATION_WINDOW_WIDTH,
                 height: this.popupOptions?.height || CONFIRMATION_WINDOW_HEIGHT,
             });
+            this.timer = setInterval(timerCallback, CONFIRMATION_WINDOW_CLOSED_POLLING_DURATION);
         }
         catch { /* Empty */ }
     }
@@ -57880,7 +57903,7 @@ const flattenProperties = (properties) => {
 };
 
 // WARNING: DO NOT CHANGE THE STRING BELOW. IT GETS REPLACED AT BUILD TIME.
-const SDK_VERSION = '1.31.1-alpha.1';
+const SDK_VERSION = '1.31.1-alpha.2';
 const getFrameParentDomain = () => {
     if (isNode()) {
         return '';
@@ -63102,7 +63125,7 @@ const IMMUTABLE_ZKVEM_GAS_OVERRIDES = {
     maxPriorityFeePerGas: BigNumber$1.from(10e9),
 };
 
-const SDK_VERSION_MARKER = '1.31.1-alpha.1';
+const SDK_VERSION_MARKER = '1.31.1-alpha.2';
 // This SDK version is replaced by the `yarn build` command ran on the root level
 const globalPackageVersion = () => SDK_VERSION_MARKER;
 

package/dist/orderbook.js

@@ -132,7 +132,7 @@ const flattenProperties = (properties) => {
 };
 
 // WARNING: DO NOT CHANGE THE STRING BELOW. IT GETS REPLACED AT BUILD TIME.
-const SDK_VERSION = '1.31.1-alpha.1';
+const SDK_VERSION = '1.31.1-alpha.2';
 const getFrameParentDomain = () => {
     if (isNode()) {
         return '';

package/dist/passport.js

@@ -11444,7 +11444,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-1.31.1-alpha.1' };
+const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-1.31.1-alpha.2' };
 const createConfig$1 = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -11623,7 +11623,7 @@ const flattenProperties = (properties) => {
 };
 
 // WARNING: DO NOT CHANGE THE STRING BELOW. IT GETS REPLACED AT BUILD TIME.
-const SDK_VERSION = '1.31.1-alpha.1';
+const SDK_VERSION = '1.31.1-alpha.2';
 const getFrameParentDomain = () => {
     if (isNode()) {
         return '';
@@ -12013,7 +12013,7 @@ const addKeysToHeadersOverride = (baseConfig, overrides) => {
 /* eslint-disable @typescript-eslint/naming-convention */
 class ApiConfiguration extends index$2.Configuration {
 }
-const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-1.31.1-alpha.1' };
+const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-1.31.1-alpha.2' };
 /**
  * @dev use createImmutableXConfiguration instead
  */
@@ -12052,7 +12052,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-1.31.1-alpha.1',
+    sdkVersion: 'ts-immutable-sdk-1.31.1-alpha.2',
     baseConfig,
 });
 const production = ({ baseConfig }) => createImmutableXConfiguration({
@@ -21161,7 +21161,7 @@ const getBlockedContents = () => `
   `;
 const getGenericContents = () => `
     <p style="color: #b6b6b6; text-align: center; margin: 0">
-      Secure pop-up didn't open?<br />We'll help you re-launch
+      Secure pop-up not showing?<br />We'll help you re-launch
     </p>
   `;
 const getTryAgainButton = () => `
@@ -21299,6 +21299,8 @@ class ConfirmationScreen {
     confirmationWindow;
     popupOptions;
     overlay;
+    overlayClosed = false;
+    timer;
     constructor(config) {
         this.config = config;
     }
@@ -21409,7 +21411,6 @@ class ConfirmationScreen {
         }
         this.popupOptions = popupOptions;
         try {
-            // confirmationWindow need to call close on in try again, then reopen
             this.confirmationWindow = openPopupCenter({
                 url: this.getHref('loading'),
                 title: CONFIRMATION_WINDOW_TITLE,
@@ -21422,7 +21423,21 @@ class ConfirmationScreen {
             // If an error is thrown here then the popup is blocked
             this.overlay = new Overlay(this.config.popupOverlayOptions, true);
         }
-        this.overlay.append(() => this.recreateConfirmationWindow(this.getHref('loading')), () => this.closeWindow());
+        this.overlay.append(() => {
+            try {
+                this.confirmationWindow?.close();
+                this.confirmationWindow = openPopupCenter({
+                    url: this.getHref('loading'),
+                    title: CONFIRMATION_WINDOW_TITLE,
+                    width: this.popupOptions?.width || CONFIRMATION_WINDOW_WIDTH,
+                    height: this.popupOptions?.height || CONFIRMATION_WINDOW_HEIGHT,
+                });
+            }
+            catch { /* Empty */ }
+        }, () => {
+            this.overlayClosed = true;
+            this.closeWindow();
+        });
     }
     closeWindow() {
         this.confirmationWindow?.close();
@@ -21432,32 +21447,40 @@ class ConfirmationScreen {
     showConfirmationScreen(href, messageHandler, resolve) {
         // If popup blocked, the confirmation window will not exist
         if (this.confirmationWindow) {
-            this.confirmationWindow.location.href = href; // update confirmation window before calling close on old window
+            this.confirmationWindow.location.href = href;
         }
         // This indicates the user closed the overlay so the transaction should be rejected
         if (!this.overlay) {
+            this.overlayClosed = false;
             resolve({ confirmed: false });
             return;
         }
-        this.overlay.update(() => this.recreateConfirmationWindow(href));
         // https://stackoverflow.com/questions/9388380/capture-the-close-event-of-popup-window-in-javascript/48240128#48240128
-        const timer = setInterval(() => {
-            if (this.confirmationWindow?.closed) {
-                clearInterval(timer);
+        const timerCallback = () => {
+            if (this.confirmationWindow?.closed || this.overlayClosed) {
+                clearInterval(this.timer);
                 window.removeEventListener('message', messageHandler);
                 resolve({ confirmed: false });
+                this.overlayClosed = false;
                 this.confirmationWindow = undefined;
             }
-        }, CONFIRMATION_WINDOW_CLOSED_POLLING_DURATION);
+        };
+        this.timer = setInterval(timerCallback, CONFIRMATION_WINDOW_CLOSED_POLLING_DURATION);
+        this.overlay.update(() => this.recreateConfirmationWindow(href, timerCallback));
     }
-    recreateConfirmationWindow(href) {
+    recreateConfirmationWindow(href, timerCallback) {
         try {
+            // Clears and recreates the timer to ensure when the confirmation window
+            // is closed and recreated the transaction is not rejected.
+            clearInterval(this.timer);
+            this.confirmationWindow?.close();
             this.confirmationWindow = openPopupCenter({
                 url: href,
                 title: CONFIRMATION_WINDOW_TITLE,
                 width: this.popupOptions?.width || CONFIRMATION_WINDOW_WIDTH,
                 height: this.popupOptions?.height || CONFIRMATION_WINDOW_HEIGHT,
             });
+            this.timer = setInterval(timerCallback, CONFIRMATION_WINDOW_CLOSED_POLLING_DURATION);
         }
         catch { /* Empty */ }
     }

package/dist/x.js

@@ -9003,7 +9003,7 @@ const flattenProperties = (properties) => {
 };
 
 // WARNING: DO NOT CHANGE THE STRING BELOW. IT GETS REPLACED AT BUILD TIME.
-const SDK_VERSION = '1.31.1-alpha.1';
+const SDK_VERSION = '1.31.1-alpha.2';
 const getFrameParentDomain = () => {
     if (isNode()) {
         return '';
@@ -9269,7 +9269,7 @@ const addKeysToHeadersOverride = (baseConfig, overrides) => {
 /* eslint-disable @typescript-eslint/naming-convention */
 class ApiConfiguration extends index$2.Configuration {
 }
-const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-1.31.1-alpha.1' };
+const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-1.31.1-alpha.2' };
 /**
  * @dev use createImmutableXConfiguration instead
  */
@@ -9308,7 +9308,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-1.31.1-alpha.1',
+    sdkVersion: 'ts-immutable-sdk-1.31.1-alpha.2',
     baseConfig,
 });
 const production = ({ baseConfig }) => createImmutableXConfiguration({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@imtbl/sdk",
   "description": "Immutable Unified SDK",
-  "version": "1.31.1-alpha.1",
+  "version": "1.31.1-alpha.2",
   "author": "Immutable",
   "browser": "./dist/index.browser.js",
   "bugs": "https://github.com/immutable/ts-immutable-sdk/issues",