@ikas/storefront 4.0.0-alpha.39 → 4.0.0-alpha.4

package/src/components/checkout/steps/step-payment/payment-gateways/index.tsx

@@ -12,20 +12,15 @@ import { CreditCardForm } from "../../../components/credit-card-form";
 import { Installments } from "./installments";
 import SelectBox from "../../../components/select-box";
 import styles from "./style.module.scss";
-import { formatCurrency, useTranslation } from "../../../../../utils";
+import { formatMoney, useTranslation } from "../../../../../utils";
 import SVGExternal from "../../../components/svg/external";
 import SVGMasterCard from "../../../components/master-pass/payment-gateway/svg/master-card";
 import { IkasPaymentGatewayAdditionalPrice } from "../../../../../models/data/payment-gateway/additional-price";
-import dynamic from "next/dynamic";
+import { StripeForm } from "../../../components/stripe";
 import { Card as MasterPassCard } from "../../../modelMasterPass";
 import CreditCardData from "../../../components/credit-card-form/model";
 import CreditCardFormMasterPass from "../../../components/master-pass/credit-card-form";
 
-//@ts-ignore
-const StripeForm = dynamic(() =>
-  import("../../../components/stripe").then((mod) => mod.StripeForm)
-);
-
 type Props = {
   vm: CheckoutViewModel;
 };
@@ -55,11 +50,7 @@ export const PaymentGateways: React.FC<Props> = observer(({ vm }) => {
 
     return `${
       ap.amountType === IkasPaymentGatewayTransactionFeeType.AMOUNT
-        ? formatCurrency(
-            ap.amount,
-            vm.checkout.currencyCode,
-            vm.checkout.currencySymbol
-          )
+        ? formatMoney(ap.amount, vm.checkout.currencyCode)
         : " %" + ap.amount
     }${
       ap.type === IkasPaymentGatewayAdditionalPriceType.DECREMENT

package/src/components/checkout/steps/step-payment/payment-gateways/installments/index.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import { observer } from "mobx-react-lite";
 import CheckoutViewModel from "../../../../model";
 
-import { formatCurrency, useTranslation } from "../../../../../../utils";
+import { formatMoney, useTranslation } from "../../../../../../utils";
 import styles from "./style.module.scss";
 import { Toggle } from "../../../../../../components/checkout/components/toggle";
 
@@ -33,19 +33,17 @@ export const Installments: React.FC<Props> = observer(({ vm }) => {
               </div>
               {ip.installmentCount !== 1 && (
                 <div className={styles.InstallmentPrice}>
-                  {formatCurrency(
+                  {formatMoney(
                     ip.installmentPrice!,
                     vm.checkout!.currencyCode,
-                    vm.checkout!.currencySymbol
                   )}
                 </div>
               )}
             </div>
             <div className={styles.Price}>
-              {formatCurrency(
+              {formatMoney(
                 ip.totalPrice!,
                 vm.checkout!.currencyCode,
-                vm.checkout!.currencySymbol
               )}
             </div>
           </div>

package/src/components/checkout/steps/step-payment/style.module.scss

@@ -5,17 +5,12 @@
 
   .TermsLabelSpan {
     color: $primaryTextColor;
-    font-weight: 500;
 
     &:hover {
       text-decoration: underline;
     }
   }
 
-  .Error {
-    color: $errorColor;
-  }
-
   .SecurePaymentContainer {
     width: 100%;
     display: flex;

package/src/components/checkout/steps/step-shipping/index.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { observer } from "mobx-react-lite";
 import CheckoutViewModel from "../../model";
-import { formatCurrency, useTranslation } from "../../../../utils";
+import { formatMoney, useTranslation } from "../../../../utils";
 
 import styles from "./style.module.scss";
 import { Button } from "../../components/button";
@@ -59,11 +59,7 @@ const ShippingMethods: React.FC<CommonProps> = observer(({ vm }) => {
             <div className={styles.ShippingPrice}>
               {asm.price === 0
                 ? t("checkout-page:free")
-                : formatCurrency(
-                    asm.price,
-                    vm.checkout.currencyCode,
-                    vm.checkout.currencySymbol
-                  )}
+                : formatMoney(asm.price, vm.checkout.currencyCode)}
             </div>
           }
           onClick={() => vm.onShippingMethodChange(asm)}
@@ -99,10 +95,9 @@ const GiftPackage: React.FC<CommonProps> = observer(({ vm }) => {
   const checkboxLabel =
     t("checkout-page:giftPackageCta") +
     (giftPackagePrice && giftPackagePrice.price
-      ? ` (+ ${formatCurrency(
+      ? ` (+ ${formatMoney(
           giftPackagePrice!.price,
-          giftPackagePrice!.currencyCode,
-          giftPackagePrice!.currencySymbol
+          giftPackagePrice!.currencyCode
         )})`
       : "");
 

package/src/components/checkout/steps/step-success/index.tsx

@@ -11,7 +11,7 @@ import SVGAmex from "../../components/credit-card-form/svg/amex";
 import SVGMasterCard from "../../components/credit-card-form/svg/master-card";
 import SVGTroy from "../../components/credit-card-form/svg/troy";
 import SVGVisa from "../../components/credit-card-form/svg/visa";
-import { formatCurrency, useTranslation } from "../../../../utils";
+import { formatMoney, useTranslation } from "../../../../utils";
 import { IkasOrderPackageStatus } from "../../../../models";
 import {
   IkasPaymentGatewayType,
@@ -125,10 +125,9 @@ export const StepSuccess: React.FC<Props> = observer(({ vm }) => {
                       null && (
                       <div className={styles.InfoText}>{`${
                         paymentMethodDetail.installment.installmentCount
-                      } x ${formatCurrency(
+                      } x ${formatMoney(
                         paymentMethodDetail.installment.installmentPrice,
-                        vm.checkout.currencyCode,
-                        vm.checkout.currencySymbol
+                        vm.checkout.currencyCode
                       )}`}</div>
                     )}
                   </React.Fragment>

package/src/components/page/head.tsx

@@ -251,18 +251,6 @@ function createStoreSchema(merchantSettings: IkasMerchantSettings) {
     logo: logo,
     image: logo,
     url: "https://" + IkasStorefrontConfig.getDomain(),
-    telephone: merchantSettings?.phone,
-    address: {
-      "@type": "PostalAddress",
-      streetAddress: merchantSettings.address?.addressLine1,
-      addressLocality: merchantSettings.address?.city?.name,
-      ...(merchantSettings.address &&
-        merchantSettings.address.state && {
-          addressRegion: merchantSettings.address.state.code,
-        }),
-      postalCode: merchantSettings.address?.postalCode,
-      addressCountry: merchantSettings.address?.country?.code,
-    },
   };
 }
 

package/src/components/page/index.tsx

@@ -19,7 +19,6 @@ import { ThemeComponent } from "./ThemeComponent";
 import { IkasBaseStore } from "../../store";
 import { initIkasEvents } from "../../analytics/events";
 import { IkasPageDataInit } from "../../page-data-init";
-import { setAPIClientConfig } from "@ikas/storefront-api";
 
 export type IkasPageProps = {
   propValues: IkasPageComponentPropValue[];
@@ -56,16 +55,15 @@ export const IkasPage: React.FC<IkasPageProps> = observer(
     productReviewSummary,
   }) => {
     const router = useRouter();
+    const store = IkasBaseStore.getInstance();
+    store.router = router;
 
     IkasStorefrontConfig.init({
       ...configJson,
       currentPageComponents: components,
     });
     IkasBaseStore.getInstance().router = router;
-    setAPIClientConfig();
 
-    const store = IkasBaseStore.getInstance();
-    store.router = router;
     store.currentPageType = pageType;
 
     const [isBrowser, setIsBrowser] = React.useState(false);
@@ -75,11 +73,7 @@ export const IkasPage: React.FC<IkasPageProps> = observer(
         pageType,
         isBrowser
       );
-      return IkasPageDataInit.initPagePropValues(
-        propValues,
-        settings,
-        isBrowser
-      );
+      return IkasPageDataInit.initPropValues(propValues, settings, isBrowser);
     }, [isBrowser, propValues, pageType, settings, pageSpecificData]);
 
     React.useEffect(() => {
@@ -105,7 +99,7 @@ export const IkasPage: React.FC<IkasPageProps> = observer(
 
     React.useEffect(() => {
       handleAnalytics(pageType, IkasPageDataInit.pageSpecificData);
-    }, [pageType, pageSpecificData]); // Not IkasPageDataInit.pageSpecificData on purpose
+    }, [pageType, IkasPageDataInit.pageSpecificData]);
 
     const renderedComponents = React.useMemo(() => {
       const headerComponentPropValue = _propValues.find(
@@ -187,6 +181,11 @@ async function handleAnalytics(
     if (pageType === IkasThemeJsonPageType.PRODUCT) {
       const product = pageSpecificData as IkasProduct;
 
+      const isBrowser = typeof window !== "undefined";
+      // if (isBrowser) {
+      //   IkasPageDataInit._initProductOnBrowser(product);
+      // }
+
       Analytics.productView(product);
 
       //@ts-ignore

package/src/components/page-editor/ThemeComponentEditor.tsx

@@ -15,11 +15,6 @@ import {
 import { IkasStorefrontConfig } from "@ikas/storefront-config";
 import { IkasPageDataInit } from "../../page-data-init";
 import { IkasBaseStore } from "../../store";
-import {
-  IkasCheckout,
-  IkasOrderLineItem,
-  IkasCheckoutSettings,
-} from "../../models/data";
 
 type Props = {
   vm: IkasPageEditorViewModel;
@@ -64,7 +59,7 @@ export class ThemeEditorComponent extends React.Component<Props> {
   get pageComponentPropValue() {
     const { vm, pageComponent } = this.props;
 
-    return vm.initializedPropValues.find(
+    return vm.pageDataProvider?.pageComponentPropValues.find(
       (pc) => pc.pageComponent.id === pageComponent.id
     );
   }
@@ -75,16 +70,13 @@ export class ThemeEditorComponent extends React.Component<Props> {
 
     if (vm.page?.type === IkasThemeJsonPageType.CHECKOUT) {
       const checkoutProps: IkasCheckoutPageProps = {
-        checkout: new IkasCheckout({
-          currencyCode: "TRY",
-          currencySymbol: "₺",
+        checkout: {
           orderLineItems: [
-            new IkasOrderLineItem({
+            {
               id: "",
               createdAt: 0,
               updatedAt: 0,
               currencyCode: "TRY",
-              currencySymbol: "₺",
               discount: null,
               discountPrice: null,
               finalPrice: 100,
@@ -114,10 +106,11 @@ export class ThemeEditorComponent extends React.Component<Props> {
                 variantValues: [],
               },
               orderedAt: 0,
-            }),
+              refundQuantity: null,
+            },
           ],
-        }),
-        checkoutSettings: new IkasCheckoutSettings({
+        } as any,
+        checkoutSettings: {
           createdAt: 0,
           updatedAt: 0,
           id: "",
@@ -133,7 +126,7 @@ export class ThemeEditorComponent extends React.Component<Props> {
           showCheckoutNote: true,
           showTermsAndConditionsCheckbox: true,
           storefrontId: "",
-        }),
+        },
         customizationProps: {
           ...propValues,
         },

package/src/components/page-editor/model.ts

@@ -14,10 +14,7 @@ import {
   IkasThemeJsonSettings,
   IkasVariantValue,
 } from "../../models";
-import {
-  IkasPageComponentPropValue,
-  IkasPageDataProvider,
-} from "@ikas/storefront-providers";
+import { IkasPageDataProvider } from "@ikas/storefront-providers";
 import { makeAutoObservable, reaction } from "mobx";
 import { NextRouter } from "next/router.js";
 import { IkasPageDataInit } from "../../page-data-init";
@@ -26,8 +23,6 @@ import HtmlMetaDataStore from "../../store/html-meta-data";
 import BlogStore from "../../store/blog";
 import RaffleStore from "../../store/raffle";
 import ProductStore from "../../store/product";
-import { setAPIClientConfig } from "@ikas/storefront-api";
-import { runInAction } from "mobx";
 
 const PACKAGE_VERSION = "2.0.20";
 // import { version as PACKAGE_VERSION } from "../../../package.json";
@@ -48,7 +43,6 @@ export default class IkasPageEditorViewModel {
   pageParams: Record<string, any> = {};
   apiKey?: string | null = null;
   pageDataProvider?: IkasPageDataProvider | null = null;
-  initializedPropValues: IkasPageComponentPropValue[] = [];
 
   router: NextRouter;
 
@@ -372,20 +366,18 @@ export default class IkasPageEditorViewModel {
       this.pageParams
     );
 
-    runInAction(() => {
-      IkasBaseStore.getInstance().currentPageType = pageType;
-      this.pageDataProvider = pageDataProvider;
+    IkasBaseStore.getInstance().currentPageType = pageType;
+    this.pageDataProvider = pageDataProvider;
 
-      if (pageType === IkasThemeJsonPageType.CUSTOM)
-        this.page = this.theme?.pages.find(
-          (p) => p.type === pageType && p.slug === this.pageParams.slug
-        );
-      else this.page = this.theme?.pages.find((p) => p.type === pageType);
+    if (pageType === IkasThemeJsonPageType.CUSTOM)
+      this.page = this.theme?.pages.find(
+        (p) => p.type === pageType && p.slug === this.pageParams.slug
+      );
+    else this.page = this.theme?.pages.find((p) => p.type === pageType);
 
-      requestAnimationFrame(() => {
-        document.body.scrollTop = 0;
-        if (document.scrollingElement) document.scrollingElement.scrollTop = 0;
-      });
+    requestAnimationFrame(() => {
+      document.body.scrollTop = 0;
+      if (document.scrollingElement) document.scrollingElement.scrollTop = 0;
     });
 
     this.sendMessage(BridgeMessageType.EDITOR_PAGE_CHANGE, {
@@ -512,8 +504,8 @@ export default class IkasPageEditorViewModel {
       IkasPageDataInit.pageSpecificData = undefined;
     }
 
-    this.initializedPropValues = IkasPageDataInit.initPagePropValues(
-      pageDataProvider.$pageComponentPropValues,
+    pageDataProvider.pageComponentPropValues = IkasPageDataInit.initPropValues(
+      pageDataProvider.pageComponentPropValues,
       theme!.settings,
       false
     );
@@ -573,13 +565,7 @@ export default class IkasPageEditorViewModel {
         translations: this.translations || {},
         isEditor: true,
         apiKey: data.apiKey,
-        apiUrl: data.apiUrl,
-        adminApiUrl: data.adminApiUrl,
-        cdnUrl: data.cdnUrl,
-        merchantSettings: data.merchantSettings,
       });
-
-      setAPIClientConfig();
     }
 
     // (window as any).editorApiKey = data.apiKey;
@@ -615,28 +601,96 @@ export default class IkasPageEditorViewModel {
 
     if (!prop || !this.selectedPageComponent) return;
 
-    const pageComponentPropValues = this.initializedPropValues.find(
-      (pv) => pv.pageComponent.id === this.selectedPageComponentId
-    );
-    if (!this.pageDataProvider || !pageComponentPropValues) return;
+    const pageComponentPropValues =
+      this.pageDataProvider?.pageComponentPropValues.find(
+        (pv) => pv.pageComponent.id === this.selectedPageComponentId
+      );
 
     this.selectedPageComponent.propValues[propName] = value;
 
+    if (!this.pageDataProvider) return;
+
     const propValue = await this.pageDataProvider.getPageComponentPropValue(
       this.selectedPageComponent,
       prop
     );
 
-    if (propValue && JSON.stringify(propValue).includes("href"))
-      await this.pageDataProvider.setLinkSlugs();
+    await this.pageDataProvider.setLinkSlugs();
 
-    pageComponentPropValues.propValues[propName] =
-      IkasPageDataInit.initPropValue(
-        prop,
-        propValue,
-        this.theme!.settings,
-        true
-      );
+    if (pageComponentPropValues) {
+      pageComponentPropValues.propValues[propName] = propValue;
+
+      if (prop.type === IkasThemeJsonComponentPropType.CUSTOM) {
+        IkasPageDataInit.initCustomDataPropValue(
+          prop,
+          propValue,
+          pageComponentPropValues,
+          this.theme!.settings,
+          true
+        );
+      } else if (prop.type === IkasThemeJsonComponentPropType.COMPONENT) {
+        IkasPageDataInit.initComponentPropValue(
+          prop,
+          propValue,
+          pageComponentPropValues,
+          this.theme!.settings,
+          true
+        );
+      } else if (prop.type === IkasThemeJsonComponentPropType.COMPONENT_LIST) {
+        IkasPageDataInit.initComponentListPropValue(
+          prop,
+          propValue,
+          pageComponentPropValues,
+          this.theme!.settings,
+          true
+        );
+      } else if (prop.type === IkasThemeJsonComponentPropType.PRODUCT_DETAIL) {
+        IkasPageDataInit.initProductPropValue(
+          prop,
+          propValue,
+          pageComponentPropValues
+        );
+      } else if (prop.type === IkasThemeJsonComponentPropType.CATEGORY) {
+        IkasPageDataInit.initCategoryPropValue(
+          prop,
+          propValue,
+          pageComponentPropValues
+        );
+      } else if (prop.type === IkasThemeJsonComponentPropType.BRAND) {
+        IkasPageDataInit.initBrandPropValue(
+          prop,
+          propValue,
+          pageComponentPropValues
+        );
+      } else if (prop.type === IkasThemeJsonComponentPropType.BLOG) {
+        IkasPageDataInit.initBlogPropValue(
+          prop,
+          propValue,
+          pageComponentPropValues
+        );
+      } else if (prop.type === IkasThemeJsonComponentPropType.BLOG_CATEGORY) {
+        IkasPageDataInit.initBlogCategoryPropValue(
+          prop,
+          propValue,
+          pageComponentPropValues
+        );
+      } else if (prop.type === IkasThemeJsonComponentPropType.RAFFLE) {
+        IkasPageDataInit.initRafflePropValue(
+          prop,
+          propValue,
+          pageComponentPropValues
+        );
+      } else if (
+        prop.type === IkasThemeJsonComponentPropType.LINK ||
+        prop.type === IkasThemeJsonComponentPropType.LIST_OF_LINK
+      ) {
+        IkasPageDataInit.initLinkPropValue(
+          prop,
+          propValue,
+          pageComponentPropValues
+        );
+      }
+    }
   };
 
   handleUpdatePageParams = async (data: any) => {
@@ -704,15 +758,24 @@ export default class IkasPageEditorViewModel {
     const pageComponentPropValues =
       await this.pageDataProvider!.getPageComponentPropValues(pageComponent);
 
-    const initializedPageComponentPropValues =
-      IkasPageDataInit.initPageComponentPropValue(
+    const customDataProps = pageComponentPropValues.component.props.filter(
+      (p) => p.type === IkasThemeJsonComponentPropType.CUSTOM
+    );
+
+    customDataProps.forEach((customDataProp) => {
+      IkasPageDataInit.initCustomDataPropValue(
+        customDataProp,
+        pageComponentPropValues.propValues[customDataProp.name],
         pageComponentPropValues,
         this.theme!.settings,
         true
       );
 
-    this.initializedPropValues.push(initializedPageComponentPropValues);
-    this.pageComponents.push(pageComponent);
+      this.pageDataProvider!.pageComponentPropValues.push(
+        pageComponentPropValues
+      );
+      this.pageComponents.push(pageComponent);
+    });
   };
 
   handleDeletePageComponent = (data: any) => {

package/src/models/data/cart/campaign-offer/index.ts

@@ -3,7 +3,7 @@ import {
   IkasCartCampaignOfferStatus,
   IkasCartCampaignOffer as ICartCampaignOffer,
 } from "@ikas/storefront-models";
-import { makeAutoObservable, makeObservable, observable } from "mobx";
+import { makeAutoObservable } from "mobx";
 import { IkasBaseModel } from "../../base";
 import { IkasCampaignOffer } from "../../campaign-offer";
 
@@ -36,18 +36,7 @@ export class IkasCartCampaignOffer
     this.targetPageTypes = data.targetPageTypes;
     this.triggerSourceOrderLineId = data.triggerSourceOrderLineId;
 
-    // makeAutoObservable(this);
-    makeObservable(this, {
-      appliedOrderLineId: observable,
-      campaignOfferId: observable,
-      campaignOffer: observable,
-      campaignOfferProductId: observable,
-      offerEndDate: observable,
-      offerStartDate: observable,
-      status: observable,
-      targetPageTypes: observable,
-      triggerSourceOrderLineId: observable,
-    });
+    makeAutoObservable(this);
   }
 }
 

package/src/models/data/cart/index.ts

@@ -12,7 +12,7 @@ export class IkasCart extends IkasOrder implements ICart {
   shippingZoneRateId: string | null = null;
   stockLocationId: string | null = null;
 
-  constructor(data: Partial<ICart>) {
+  constructor(data: ICart) {
     super(data);
 
     this.availableShippingMethods =

package/src/models/data/category/path-item/index.ts

@@ -3,8 +3,6 @@ import { IkasBaseModel } from "../../base";
 import { IkasCategoryPathItem as ICategoryPathItem } from "@ikas/storefront-models";
 import { computed, makeObservable, observable } from "mobx";
 import { IkasCategoryPathItemFunctions } from "@ikas/storefront-model-functions";
-import { IkasCategoryTranslation } from "../translations";
-import { IkasStorefrontConfig } from "@ikas/storefront-config";
 
 export class IkasCategoryPathItem
   extends IkasBaseModel
@@ -14,7 +12,6 @@ export class IkasCategoryPathItem
   description: string | null;
   imageId: string | null;
   name: string;
-  translations?: IkasCategoryTranslation[] | null = null;
 
   constructor(data: ICategoryPathItem) {
     super(data);
@@ -23,7 +20,6 @@ export class IkasCategoryPathItem
     this.description = data.description || null;
     this.imageId = data.imageId || null;
     this.name = data.name;
-    this.translations = data.translations || null;
 
     makeObservable(this, {
       metaData: observable,

package/src/models/data/checkout/index.ts

@@ -2,7 +2,7 @@ import { IkasCart } from "../cart";
 import { IkasCheckout as ICheckout } from "@ikas/storefront-models";
 import { IkasCheckoutFunctions } from "@ikas/storefront-model-functions";
 import { IkasPaymentGateway } from "../payment-gateway";
-import { formatCurrency } from "../../../utils/currency";
+import { formatMoney } from "../../../utils/currency";
 import { computed, makeObservable, observable } from "mobx";
 import { formatDate } from "../../../utils/helper";
 
@@ -17,13 +17,9 @@ export class IkasCheckout extends IkasCart implements ICheckout {
   selectedPaymentGateway?: IkasPaymentGateway | null = null;
   masterPassPaymentGateway?: IkasPaymentGateway | null = null;
 
-  constructor(data: Partial<IkasCheckoutConstructorData>) {
+  constructor(data: IkasCheckoutConstructorData) {
     super(data);
 
-    this.appliedCouponCode = data.couponCode;
-    this.selectedPaymentGateway = data.selectedPaymentGateway;
-    this.masterPassPaymentGateway = data.masterPassPaymentGateway;
-
     makeObservable(this, {
       appliedCouponCode: observable,
       selectedPaymentGateway: observable,
@@ -48,11 +44,7 @@ export class IkasCheckout extends IkasCart implements ICheckout {
   }
 
   get $formattedTotalFinalPrice() {
-    return formatCurrency(
-      this.$totalFinalPrice,
-      this.currencyCode,
-      this.currencySymbol
-    );
+    return formatMoney(this.$totalFinalPrice, this.currencySymbol);
   }
 
   get dateStr() {

package/src/models/data/checkout-settings/price/index.ts

@@ -3,12 +3,10 @@ import { makeAutoObservable } from "mobx";
 
 export class IkasCheckoutSettingsPrice implements ICheckoutSettingsPrice {
   currencyCode: string;
-  currencySymbol: string | null;
   price: number;
 
   constructor(data: ICheckoutSettingsPrice) {
     this.currencyCode = data.currencyCode;
-    this.currencySymbol = data.currencySymbol || null;
     this.price = data.price;
 
     makeAutoObservable(this);

package/src/models/data/merchant-settings/index.ts

@@ -1,18 +1,15 @@
 import {
   IkasMerchantSettingsCurrencyFormat,
   IkasMerchantSettings as IMerchantSettings,
-  IkasMerchantAddress,
 } from "@ikas/storefront-models";
 import { makeAutoObservable } from "mobx";
 import { IkasImage } from "../image";
 
 export class IkasMerchantSettings implements IMerchantSettings {
   currencyFormats: IkasMerchantSettingsCurrencyFormat[] | null;
-  address: IkasMerchantAddress | null;
   logoId: string | null;
   merchantId: string;
   merchantName: string;
-  phone: string | null;
 
   // Extra
   logo?: IkasImage | null;
@@ -22,13 +19,7 @@ export class IkasMerchantSettings implements IMerchantSettings {
     this.logoId = data.logoId;
     this.merchantId = data.merchantId;
     this.merchantName = data.merchantName;
-    this.phone = data.phone || null;
-    this.address = data.address || null;
-
     this.logo = data.logo ? new IkasImage(data.logo) : null;
-    if (!this.logo && this.logoId) {
-      this.logo = new IkasImage({ id: this.logoId, isVideo: false });
-    }
 
     makeAutoObservable(this);
   }