Skip to content

Commit 9b62b24

Browse files
authored
Merge pull request #280 from hyva-themes/277/payment-rest-api-hook
#277 Implement a common hook to perform save payment using REST Api
2 parents 0050804 + 769742a commit 9b62b24

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+6630
-6550
lines changed

src/reactapp/package-lock.json

Lines changed: 6424 additions & 6461 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/reactapp/package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
"private": true,
1515
"proxy": "https://demo.hyva.io",
1616
"dependencies": {
17-
"@heroicons/react": "^1.0.5",
18-
"formik": "^2.2.6",
17+
"@heroicons/react": "^1.0.6",
18+
"formik": "^2.2.9",
1919
"lodash.get": "^4.4.2",
2020
"lodash.set": "^4.3.2",
2121
"npm-run-all": "^4.1.5",
22-
"preact": "^10.6.4",
23-
"prop-types": "^15.7.2",
24-
"react": "^17.0.1",
25-
"react-app-polyfill": "^2.0.0",
26-
"react-dom": "^17.0.1",
22+
"preact": "^10.7.0",
23+
"prop-types": "^15.8.1",
24+
"react": "^17.0.2",
25+
"react-app-polyfill": "^3.0.0",
26+
"react-dom": "^17.0.2",
2727
"react-scripts": "^5.0.0",
2828
"yup": "^0.32.11"
2929
},
@@ -68,23 +68,23 @@
6868
]
6969
},
7070
"devDependencies": {
71-
"@babel/core": "^7.16.5",
72-
"@babel/eslint-parser": "^7.16.5",
73-
"@babel/preset-env": "^7.16.5",
74-
"@babel/preset-react": "^7.16.5",
71+
"@babel/core": "^7.17.8",
72+
"@babel/eslint-parser": "^7.17.0",
73+
"@babel/preset-env": "^7.16.11",
74+
"@babel/preset-react": "^7.16.7",
7575
"@tailwindcss/forms": "^0.3.4",
76-
"eslint": "^7.2.0",
77-
"eslint-config-airbnb": "^18.2.1",
78-
"eslint-config-prettier": "^8.3.0",
79-
"eslint-plugin-import": "^2.25.3",
76+
"eslint": "^8.12.0",
77+
"eslint-config-airbnb": "^19.0.4",
78+
"eslint-config-prettier": "^8.5.0",
79+
"eslint-plugin-import": "^2.25.4",
8080
"eslint-plugin-jsx-a11y": "^6.5.1",
81-
"eslint-plugin-prettier": "^3.4.1",
82-
"eslint-plugin-react": "^7.27.1",
83-
"eslint-plugin-react-hooks": "^4.3.0",
81+
"eslint-plugin-prettier": "^4.0.0",
82+
"eslint-plugin-react": "^7.29.4",
83+
"eslint-plugin-react-hooks": "^4.4.0",
8484
"husky": "^7.0.4",
85-
"lint-staged": "^11.2.6",
86-
"prettier": "^2.5.1",
87-
"react-app-rewired": "^2.1.9",
85+
"lint-staged": "^12.3.7",
86+
"prettier": "^2.6.1",
87+
"react-app-rewired": "^2.2.1",
8888
"react-dev-utils": "^12.0.0",
8989
"tailwindcss": "^2.2.19"
9090
}

src/reactapp/src/api/sendRequest.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const storeCode = env.storeCode || RootElement.getStoreCode();
1616

1717
export default function sendRequest(
1818
dispatch,
19+
// eslint-disable-next-line default-param-last
1920
queryParams = {},
2021
relativeUrl,
2122
responseType = 'json',

src/reactapp/src/components/CheckoutForm/CheckoutFormWrapper.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useEffect, useState } from 'react';
1+
import { useEffect, useState } from 'react';
22
import _get from 'lodash.get';
33
import { useFormikContext } from 'formik';
44
import { bool, object, node, oneOfType } from 'prop-types';
@@ -81,7 +81,7 @@ function CheckoutFormWrapper({ initialData, children }) {
8181
shippingAddressValues,
8282
]);
8383

84-
return <>{children}</>;
84+
return children;
8585
}
8686

8787
CheckoutFormWrapper.propTypes = {

src/reactapp/src/components/address/components/AddressCard.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ AddressCard.propTypes = {
6666

6767
AddressCard.defaultProps = {
6868
title: '',
69-
billingSameCheckbox: <></>,
69+
billingSameCheckbox: null,
7070
};
7171

7272
export default AddressCard;

src/reactapp/src/components/address/components/AddressWrapper/AddressWrapperMemorized.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ const AddressWrapperMemorized = React.memo(({ children, formikData }) => {
121121
setMostRecentAddressOptions(addressOptions);
122122
}, [stateList]);
123123

124+
// eslint-disable-next-line react/jsx-no-constructed-context-values
124125
const context = {
125126
billingSelected,
126127
setBillingSelected,

src/reactapp/src/components/address/components/CreateNewAddressLink.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function CreateNewAddressLink({ actions, forceHide }) {
1111
const { isLoggedIn } = useAppContext();
1212

1313
if (!isLoggedIn || forceHide) {
14-
return <></>;
14+
return null;
1515
}
1616

1717
return (

src/reactapp/src/components/address/components/SaveInBookCheckbox.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function SaveInBookCheckbox({ fields, formikData }) {
1212
const saveInAddressBook = !!_get(formikData, 'formSectionValues.saveInBook');
1313

1414
if (!isLoggedIn || !customer?.hasAddress) {
15-
return <></>;
15+
return null;
1616
}
1717

1818
return (

src/reactapp/src/components/billingAddress/BillingAddressMemorized.jsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ const BillingAddressMemorized = React.memo(({ formikData }) => {
2222
<BillingAddressView />
2323
</ToggleBox>
2424
</Card>
25-
) : (
26-
<></>
27-
)}
25+
) : null}
2826
</BillingAddressFormikProvider>
2927
);
3028
});

src/reactapp/src/components/billingAddress/components/BillingAddressForm.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ function BillingAddressForm() {
9191
};
9292

9393
if (viewMode) {
94-
return <></>;
94+
return null;
9595
}
9696

9797
return (

0 commit comments

Comments
 (0)