@weareconceptstudio/account 0.3.8 → 0.3.9

package/dist/modules/account/AccountBalanceTemplate/HistoryBalance/ItemHistory/index.js

@@ -1,12 +1,9 @@
 import React, { useEffect, useRef } from 'react';
 import { Text, useTranslation } from '@weareconceptstudio/core';
-import { useAccountContext } from '../../../../../AccountProvider';
 //* Styles
 import ItemHistoryStyle from './style';
 const ItemHistory = ({ date, activity, value, action_type }) => {
     const { translate } = useTranslation();
-    const { useCart } = useAccountContext();
-    const { currency } = useCart();
     //! Refs
     const titleWrapperRef = useRef();
     const getSizeItem = useRef();
@@ -39,9 +36,7 @@ const ItemHistory = ({ date, activity, value, action_type }) => {
             React.createElement(Text, { className: `account-primary-color1 account-font-medium account-p account-p1 amount-info-text ${action_type}` },
                 React.createElement(Text, { className: 'account-primary-color1 account-font-medium account-p1 mobile-amount-info-text first-letter', tag: 'span' }, translate('balanceCategoryAmount')),
                 ' ',
-                value,
-                " ",
-                currency)),
+                value)),
         React.createElement("div", { className: 'line-info' })));
 };
 export default ItemHistory;

package/dist/modules/account/AccountSettingsTemplate/AccountInfo/index.js

@@ -35,6 +35,6 @@ const AccountInfo = ({ user, onAccountUpdate, displayFields = defaultDisplayFiel
                 } },
                 React.createElement("div", { className: `cancel-and-save-and-apply-wrap` },
                     React.createElement(AccountButton, { text: `cancel`, btnType: `green-large-text`, onClick: () => setEdit(false) }),
-                    React.createElement(AccountButton, { type: 'submit', text: `saveAndApply`, btnType: `full-width` }))))))));
+                    React.createElement(AccountButton, { type: 'submit', text: `saveChanges`, btnType: `full-width` }))))))));
 };
 export default AccountInfo;

package/dist/modules/account/AccountSettingsTemplate/AccountPassword/index.js

@@ -34,6 +34,6 @@ const AccountPassword = ({ formFields = defaultFormFields, onPasswordUpdate }) =
             }, className: 'form-items-wrap', onSubmit: onFinish, fields: formFields },
             React.createElement("div", { className: `cancel-and-save-and-apply-wrap` },
                 React.createElement(AccountButton, { text: `cancel`, btnType: `green-large-text`, onClick: () => setEdit(false) }),
-                React.createElement(AccountButton, { type: 'submit', text: `saveAndApply`, btnType: `full-width` }))))));
+                React.createElement(AccountButton, { type: 'submit', text: `saveChanges`, btnType: `full-width` }))))));
 };
 export default AccountPassword;

package/dist/modules/address/AddressForm/index.js

@@ -1,7 +1,8 @@
-import React, { memo as Memo, useState, useCallback } from 'react';
+import React, { memo as Memo, useState, useCallback, useMemo } from 'react';
 import { useUi, Text } from '@weareconceptstudio/core';
 import { FormBuilder } from '@weareconceptstudio/form';
 import { useAddressContext } from '../AddressProvider';
+import { useCheckoutContext } from '../../checkout';
 import AccountButton from '../../../components/AccountButton';
 //* Icons
 import { CheckboxIcon, CheckboxCheckedIcon } from '../../../utils/icons';
@@ -9,10 +10,14 @@ import { CheckboxIcon, CheckboxCheckedIcon } from '../../../utils/icons';
 import AddressFormStyle from './style';
 const AddressForm = Memo(({ title, data, type }) => {
     const { formFields, createAddress, updateAddress } = useAddressContext();
+    const { isCheckoutPage } = useCheckoutContext();
     const { closePopup } = useUi();
     //! States
     const [isChecked, setIsChecked] = useState(data?.is_default || false);
     const [isDisabled, setIsDisabled] = useState(false);
+    const isEdit = useMemo(() => {
+        return !!data?.id;
+    }, [data]);
     //! On Finish
     const onFinish = useCallback((values) => {
         const newData = {
@@ -22,10 +27,10 @@ const AddressForm = Memo(({ title, data, type }) => {
         };
         setIsDisabled(true);
         return (!isDisabled &&
-            eval(data?.id ? `updateAddress({data: newData, addressId: data.id, type})` : `createAddress({data: newData, type})`).then(() => {
+            eval(isEdit ? `updateAddress({data: newData, addressId: data.id, type})` : `createAddress({data: newData, type})`).then(() => {
                 closePopup();
             }));
-    }, [data, isChecked, createAddress, updateAddress, isDisabled]);
+    }, [data, isChecked, createAddress, updateAddress, isDisabled, isEdit]);
     return (React.createElement(AddressFormStyle, { className: 'address-form-block' },
         React.createElement(Text, { tag: `h6`, text: title, className: `account-h6 account-font-bold account-primary-color1 address-form-block-title` }),
         React.createElement(FormBuilder, { formOptions: {
@@ -38,6 +43,6 @@ const AddressForm = Memo(({ title, data, type }) => {
                 React.createElement(Text, { className: `account-p account-p2 account-font-medium account-primary-color1 address-form-is-default-checkbox`, text: `${type === 'shipping' ? 'makeYourDefaultShippingAddress' : type == 'billing' ? 'makeYourDefaultBillingAddress' : 'makeYourDefaultAddress'}` }))) : (React.createElement(Text, { className: `account-p account-p2 account-font-medium account-primary-color1 address-form-is-default`, text: `${type === 'shipping' ? 'thisYourDefaultShippingAddress' : type == 'billing' ? 'thisYourDefaultBillingAddress' : 'thisYourDefaultAddress'}` }))),
             React.createElement("div", { className: `cancel-and-save-wrap` },
                 React.createElement(AccountButton, { text: `cancel`, onClick: closePopup, btnType: `green-large-text`, className: `address-form-cancel-btn` }),
-                React.createElement(AccountButton, { type: 'submit', text: `saveAndApply`, btnType: `full-width`, className: `address-form-cancel-submit`, disabled: isDisabled })))));
+                React.createElement(AccountButton, { type: 'submit', text: `${isCheckoutPage ? 'saveAndApply' : isEdit ? 'saveChanges' : 'save'}`, btnType: `full-width`, className: `address-form-cancel-submit`, disabled: isDisabled })))));
 });
 export default AddressForm;

package/dist/modules/checkout/CheckoutTemplate/index.js

@@ -1,5 +1,5 @@
-import React, { useCallback, useRef, useState } from 'react';
-import { Page } from '@weareconceptstudio/core';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { Page, useEvent } from '@weareconceptstudio/core';
 import { Sequence, TotalCheckout } from '../../../components';
 import { useAddressContext } from '../../address';
 import { useAccountContext } from '../../../AccountProvider';
@@ -7,6 +7,7 @@ import { useCheckoutContext } from '../CheckoutProvider';
 import StepReview from './StepReview';
 import StepShipping from './StepShipping';
 import AccountContainer from '../../../components/AccountContainer';
+import Loader from '../../../components/Loader';
 //* Styles
 import CheckoutTemplateStyle from './style';
 //* Skeleton
@@ -18,7 +19,7 @@ const CheckoutTemplate = () => {
     const { hasCheckoutAddress, addressLoading } = useAddressContext();
     const { handleCheckout } = useCheckoutContext();
     const { useCart } = useAccountContext();
-    const { items } = useCart();
+    const { items, itemsCount } = useCart();
     const checkStep = {
         isShipping: !hasCheckoutAddress,
         isReview: hasCheckoutAddress,
@@ -41,7 +42,8 @@ const CheckoutTemplate = () => {
         }
     }, [checkStep]);
     return (React.createElement(Page, { className: 'checkout use-account' },
-        React.createElement(AccountContainer, { className: `second-version` },
+        React.createElement(Loader, { className: 'checkout', pathname: window.location.pathname }),
+        itemsCount ? (React.createElement(AccountContainer, { className: `second-version` },
             React.createElement(CheckoutTemplateStyle, null,
                 React.createElement(TotalCheckout, { isShipping: checkStep.isShipping, buttonProps: {
                         url: false,
@@ -54,6 +56,6 @@ const CheckoutTemplate = () => {
                     checkStep.isShipping ? React.createElement(StepShipping, { firstStepFormRef: firstStepFormRef }) : React.createElement(StepReview, { items: items }))) : (React.createElement(React.Fragment, null,
                     React.createElement(SequenceSkeleton, { className: 'sequence-checkout-template' }),
                     React.createElement(SkeletonAddressSelect, { className: 'address-checkout-template' }),
-                    React.createElement(SkeletonCartTemplate, null))))))));
+                    React.createElement(SkeletonCartTemplate, null))))))) : null));
 };
 export default CheckoutTemplate;

package/dist/modules/payment/PaymentMethodItem/index.js

@@ -16,7 +16,7 @@ const PaymentMethodItem = ({ item, selectedPayment, setSelectedPayment, singlePa
     return (React.createElement(PaymentMethodItemStyle, { className: `${isCardType && singlePayment && item?.card?.is_expired ? 'expired' : ''} ${singlePayment ? 'single-payment' : ''} custom-payment-options` },
         React.createElement("div", { className: 'payment-option-top' },
             React.createElement("div", { className: 'payment-item-left' },
-                icons[item.value],
+                icons?.[item.value],
                 React.createElement(Text, { className: 'payment-label account-p account-p3 account-font-regular account-primary-color1' }, item.label)),
             React.createElement("div", { key: item.value, className: `circle-selected-wrap cursor-pointer ${selectedPayment === item.value || (item.value == 'card' && isNumeric(selectedPayment)) || singlePayment ? 'active' : ''}`, onClick: () => !singlePayment && setSelectedPayment(item.value) },
                 React.createElement("svg", { version: '1.1', viewBox: '0 0 32 32', xmlns: 'http://www.w3.org/2000/svg', className: `checkbox-icon ${selectedPayment === item.value || (item.value == 'card' && isNumeric(selectedPayment)) || singlePayment ? 'selected' : 'note-selected'}` },

package/dist/modules/payment/PaymentMethodsTemplate/index.js

@@ -1,4 +1,3 @@
-'use client';
 import React, { useState, useCallback } from 'react';
 import { api, Text, useUi } from '@weareconceptstudio/core';
 import { useAccountContext } from '../../../AccountProvider';
@@ -32,6 +31,6 @@ const PaymentMethodsTemplate = () => {
             React.createElement(Text, { tag: `h6`, className: `account-font-medium account-primary-color1 title`, text: `myCards` }),
             React.createElement(PaymentWrap, { selectedPayment: selectedPayment, setSelectedPayment: setSelectedPayment }),
             React.createElement("div", { className: 'account-payment-btn-wrapper' },
-                React.createElement(AccountButton, { btnType: `full-width`, text: `saveAndApply`, onClick: handlePaymentMethodChangeSubmit })))));
+                React.createElement(AccountButton, { btnType: `full-width`, text: `save`, onClick: handlePaymentMethodChangeSubmit })))));
 };
 export default PaymentMethodsTemplate;

package/dist/translations/en.d.ts

@@ -79,6 +79,7 @@ declare const _default: {
     change: string;
     edit: string;
     submit: string;
+    save: string;
     orderItems: string;
     orderDate: string;
     totalItems: string;

package/dist/translations/en.js

@@ -87,6 +87,7 @@ export default {
     change: 'Change',
     edit: 'Edit',
     submit: 'Submit',
+    save: 'Save',
     //! Order
     orderItems: 'Order items',
     orderDate: 'Order date',

package/dist/translations/hy.d.ts

@@ -79,6 +79,7 @@ declare const _default: {
     change: string;
     edit: string;
     submit: string;
+    save: string;
     orderItems: string;
     orderDate: string;
     totalItems: string;

package/dist/translations/hy.js

@@ -87,6 +87,7 @@ export default {
     change: 'Change',
     edit: 'Edit',
     submit: 'Submit',
+    save: 'Save',
     //! Order
     orderItems: 'Order items',
     orderDate: 'Order date',

package/dist/translations/index.d.ts

@@ -80,6 +80,7 @@ declare const _default: {
         change: string;
         edit: string;
         submit: string;
+        save: string;
         orderItems: string;
         orderDate: string;
         totalItems: string;
@@ -294,6 +295,7 @@ declare const _default: {
         change: string;
         edit: string;
         submit: string;
+        save: string;
         orderItems: string;
         orderDate: string;
         totalItems: string;
@@ -508,6 +510,7 @@ declare const _default: {
         change: string;
         edit: string;
         submit: string;
+        save: string;
         orderItems: string;
         orderDate: string;
         totalItems: string;

package/dist/translations/ru.d.ts

@@ -79,6 +79,7 @@ declare const _default: {
     change: string;
     edit: string;
     submit: string;
+    save: string;
     orderItems: string;
     orderDate: string;
     totalItems: string;

package/dist/translations/ru.js

@@ -87,6 +87,7 @@ export default {
     change: 'Change',
     edit: 'Edit',
     submit: 'Submit',
+    save: 'Save',
     //! Order
     orderItems: 'Order items',
     orderDate: 'Order date',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@weareconceptstudio/account",
-	"version": "0.3.8",
+	"version": "0.3.9",
 	"description": "Concept Studio Account",
 	"author": "Concept Studio",
 	"license": "ISC",