From 02973aca6e4183fc7ac47db7031776b4acb68b46 Mon Sep 17 00:00:00 2001
From: Tetiana Mandziuk <tetianaman@wix.com>
Date: Mon, 14 Oct 2024 09:39:57 +0200
Subject: [PATCH 1/2] fix: remove duplicated Price component

---
 app/routes/cart/route.tsx                       |  1 +
 src/components/cart/cart-item/cart-item.tsx     |  6 +++---
 src/components/price/price.module.scss          | 10 ----------
 src/components/price/price.tsx                  | 17 -----------------
 .../product-price/product-price.module.scss     |  1 +
 5 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 src/components/price/price.module.scss
 delete mode 100644 src/components/price/price.tsx

diff --git a/app/routes/cart/route.tsx b/app/routes/cart/route.tsx
index d1fd4c8f..bc4a3e11 100644
--- a/app/routes/cart/route.tsx
+++ b/app/routes/cart/route.tsx
@@ -11,6 +11,7 @@ const mockCartItem: cart.LineItem = {
     quantity: 1,
     image: 'https://static.wixstatic.com/media/c837a6_18152edaef9940ca88f446ae94b48a47~mv2.jpg/v1/fill/w_824,h_1098,al_c,q_85,usm_0.66_1.00_0.01,enc_auto/c837a6_18152edaef9940ca88f446ae94b48a47~mv2.jpg',
     price: { formattedConvertedAmount: '$5.50' },
+    fullPrice: { formattedConvertedAmount: '$7.50' },
 };
 
 const noop = () => {};
diff --git a/src/components/cart/cart-item/cart-item.tsx b/src/components/cart/cart-item/cart-item.tsx
index 7fbcaa19..37e4315d 100644
--- a/src/components/cart/cart-item/cart-item.tsx
+++ b/src/components/cart/cart-item/cart-item.tsx
@@ -5,10 +5,10 @@ import { TrashIcon, ImagePlaceholderIcon, ErrorIcon } from '~/components/icons';
 import classNames from 'classnames';
 import debounce from 'lodash.debounce';
 import { useMemo, useState } from 'react';
-import { Price } from '~/components/price/price';
 
 import styles from './cart-item.module.scss';
 import { Spinner } from '~/components/spinner/spinner';
+import { ProductPrice } from '~/components/product-price/product-price';
 
 export interface CartItemProps {
     item: cart.LineItem;
@@ -62,8 +62,8 @@ export const CartItem = ({
                     <div className={styles.productNameAndPrice}>
                         <div className={styles.productName}>{productName}</div>
                         {item.fullPrice?.formattedConvertedAmount && (
-                            <Price
-                                fullPrice={item.fullPrice?.formattedConvertedAmount}
+                            <ProductPrice
+                                price={item.fullPrice?.formattedConvertedAmount}
                                 discountedPrice={item.price?.formattedConvertedAmount}
                             />
                         )}
diff --git a/src/components/price/price.module.scss b/src/components/price/price.module.scss
deleted file mode 100644
index 6d30d217..00000000
--- a/src/components/price/price.module.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.root {
-    display: flex;
-    gap: 4px;
-    font: var(--paragraph3);
-}
-
-.previousPrice {
-    text-decoration: line-through;
-    color: rgba(23, 17, 13, 0.7);
-}
diff --git a/src/components/price/price.tsx b/src/components/price/price.tsx
deleted file mode 100644
index 1fdacb09..00000000
--- a/src/components/price/price.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import styles from './price.module.scss';
-
-export interface PriceProps {
-    discountedPrice?: string;
-    fullPrice: string;
-}
-
-export const Price = ({ fullPrice, discountedPrice }: PriceProps) => {
-    const hasDiscount = discountedPrice !== undefined && fullPrice !== discountedPrice;
-
-    return (
-        <div className={styles.root}>
-            {hasDiscount && <div className={styles.previousPrice}>{fullPrice}</div>}
-            <div>{hasDiscount ? discountedPrice : fullPrice}</div>
-        </div>
-    );
-};
diff --git a/src/components/product-price/product-price.module.scss b/src/components/product-price/product-price.module.scss
index f882987a..bca2d1de 100644
--- a/src/components/product-price/product-price.module.scss
+++ b/src/components/product-price/product-price.module.scss
@@ -5,4 +5,5 @@
 
 .beforeDiscount {
     text-decoration: line-through;
+    color: rgba(23, 17, 13, 0.6);
 }

From c20878b94161bbfae6196e09718f173842e8fefc Mon Sep 17 00:00:00 2001
From: Tetiana Mandziuk <tetianaman@wix.com>
Date: Mon, 14 Oct 2024 09:51:40 +0200
Subject: [PATCH 2/2] tweak

---
 src/components/product-price/product-price.module.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/product-price/product-price.module.scss b/src/components/product-price/product-price.module.scss
index bca2d1de..f882987a 100644
--- a/src/components/product-price/product-price.module.scss
+++ b/src/components/product-price/product-price.module.scss
@@ -5,5 +5,4 @@
 
 .beforeDiscount {
     text-decoration: line-through;
-    color: rgba(23, 17, 13, 0.6);
 }