added masElement log and changed imports

adobecom · Feb 13, 2025 · be4444b · be4444b
1 parent 9baafa1
commit be4444b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 20 deletions.
diff --git a/libs/blocks/merch/three-in-one.js b/libs/blocks/merch/three-in-one.js
@@ -1,5 +1,8 @@
-import { createTag, getConfig } from '../../utils/utils.js';
+/* eslint-disable import/no-relative-packages */
+import { createTag } from '../../utils/utils.js';
 import { MODAL_TYPE_3_IN_1 } from '../../deps/mas/constants.js';
+import '../../features/spectrum-web-components/dist/theme.js';
+import '../../features/spectrum-web-components/dist/progress-circle.js';
 
 export const MSG_SUBTYPE = {
   AppLoaded: 'AppLoaded',
@@ -54,11 +57,6 @@ export const handle3in1IFrameEvents = ({ data: msgData }) => {
 };
 
 export async function createContent(iframeUrl, modalType) {
-  const { base } = getConfig();
-  await Promise.all([
-    import(`${base}/features/spectrum-web-components/dist/theme.js`),
-    import(`${base}/features/spectrum-web-components/dist/progress-circle.js`),
-  ]);
   const content = createTag('div', { class: 'milo-iframe' });
   const title = modalType === MODAL_TYPE_3_IN_1.CRM ? 'Single App' : modalType;
   const iframe = createTag('iframe', {

diff --git a/libs/deps/mas/commerce.js b/libs/deps/mas/commerce.js
diff --git a/libs/deps/mas/mas.js b/libs/deps/mas/mas.js
diff --git a/libs/deps/mas/merch-card.js b/libs/deps/mas/merch-card.js
diff --git a/libs/features/mas/dist/mas.js b/libs/features/mas/dist/mas.js
diff --git a/libs/features/mas/src/checkout-mixin.js b/libs/features/mas/src/checkout-mixin.js
@@ -160,7 +160,7 @@ export function CheckoutMixin(Base) {
             }
             return newUrl.toString();
           } catch (error) {
-            // do nothing
+            this.masElement.log?.error('Failed to add 3-in-1 modal parameters', error);
           }
         }
 
@@ -178,7 +178,7 @@ export function CheckoutMixin(Base) {
                 return modalParam;
             }
           } catch (error) {
-            // do nothing
+            this.masElement.log?.error('Failed to set modal type', error);
           }
         }