diff --git a/package.json b/package.json index dd339fb..c56fdff 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "prettier:write": "prettier --write ." }, "dependencies": { - "@acm-uiuc/core-client": "^4.1.9", + "@acm-uiuc/core-client": "^4.1.10", "@acm-uiuc/js-shared": "^3.2.0", "@azure/msal-browser": "^4.15.0", "@azure/msal-react": "^3.0.15", diff --git a/src/app/(membership)/store/page.tsx b/src/app/(membership)/store/page.tsx index 13c0d52..9c8403f 100644 --- a/src/app/(membership)/store/page.tsx +++ b/src/app/(membership)/store/page.tsx @@ -7,7 +7,6 @@ import { transformApiResponse } from './transform'; import { storeApiClient } from '@/utils/api'; import { ApiV1StoreProductsGet200Response } from '@acm-uiuc/core-client'; -type Product = ApiV1StoreProductsGet200Response['products'][number]; const MerchStore = () => { const [itemsList, setItemsList] = useState>>([]); const baseUrl = process.env.NEXT_PUBLIC_CORE_API_BASE_URL; @@ -21,15 +20,7 @@ const MerchStore = () => { const metaLoader = async () => { try { const data = await storeApiClient.apiV1StoreProductsGet(); - const filteredData = { - products: data.products.filter( - ( - x, - ): x is Product & { productId: NonNullable } => - x.productId !== null, - ), - }; - setItemsList(transformApiResponse(filteredData)); + setItemsList(transformApiResponse(data)); } catch (e) { console.error('failed to get products', e); setItemsList([ @@ -84,7 +75,7 @@ const MerchStore = () => {

Cost: ${decimalHelper(val['item_price']['paid'])} for{' '} {val['valid_member_lists'] && - val['valid_member_lists'].length > 0 + val['valid_member_lists'].length > 0 ? 'paid ACM@UIUC and eligible partner organization' : 'paid ACM@UIUC'}{' '} members, ${decimalHelper(val['item_price']['others'])} for diff --git a/yarn.lock b/yarn.lock index bf4a58f..abd9602 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@acm-uiuc/core-client@^4.1.9": - version "4.1.9" - resolved "https://registry.yarnpkg.com/@acm-uiuc/core-client/-/core-client-4.1.9.tgz#16858703ca1f35e550ddae7df616ef573829f8ed" - integrity sha512-Zc1WU0d5skEiomSWb+j1QtiIKhpYVBSEVHTURUY/QCUD9Mg01muJPYrnfkB1r0OlszTF2OqXH838mlia+Hh8Lg== +"@acm-uiuc/core-client@^4.1.10": + version "4.1.10" + resolved "https://registry.yarnpkg.com/@acm-uiuc/core-client/-/core-client-4.1.10.tgz#7c4c035c6fd9fced63690f2001b1cf109a307669" + integrity sha512-pSAhfS9C7cuy12Q67D4I+ADv3cy2kq9czE2oe5vEZW//TYB6zwFQU+toZqrbScniG38NLeq/4Z1CLcDovGXNyw== "@acm-uiuc/js-shared@^3.2.0": version "3.2.0"