Fix typos and refactor

saleor · Oct 30, 2023 · af65064 · af65064
1 parent 9d9907d
commit af65064
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json
@@ -7373,6 +7373,9 @@
     "context": "Add filter button text",
     "string": "+ Add filter"
   },
+  "o/4OCR": {
+    "string": "Shipping has already been refunded"
+  },
   "o5KXAN": {
     "context": "delete webhook",
     "string": "Are you sure you want to delete {name}?"
@@ -7515,9 +7518,6 @@
     "context": "status",
     "string": "Deactivated"
   },
-  "pNP2pn": {
-    "string": "Shipping has been already refunded"
-  },
   "pOUOnw": {
     "context": "tab name",
     "string": "All vouchers"

diff --git a/src/orders/components/OrderGrantRefundPage/components/ShippingInluded.tsx b/src/orders/components/OrderGrantRefundPage/components/ShippingInluded.tsx
@@ -49,8 +49,8 @@ export const ShippingIncluded = ({
       {!canRefundShipping && (
         <Text variant="caption" color="textNeutralDisabled">
           <FormattedMessage
-            defaultMessage="Shipping has been already refunded"
-            id="pNP2pn"
+            defaultMessage="Shipping has already been refunded"
+            id="o/4OCR"
           />
         </Text>
       )}

diff --git a/src/orders/components/OrderGrantRefundPage/reducer.ts b/src/orders/components/OrderGrantRefundPage/reducer.ts
@@ -144,20 +144,19 @@ function createToGrantRefundLineMap(
       | OrderDetailsGrantRefundFragment["fulfillments"][0]["lines"][0],
   ): GrantRefundLineKeyValue => {
     const initialQuantity =
-      grantedRefund?.lines?.find(
-        initLine => (initLine as any).orderLine.id === line.id,
-      )?.quantity ?? 0;
+      grantedRefund?.lines?.find(initLine => initLine.orderLine.id === line.id)
+        ?.quantity ?? 0;
 
     return [
       line.id,
       {
         isDirty: false,
-        availableQuantity: getLineAvailableQuantity(
-          line.id,
-          line.quantity,
-          order?.grantedRefunds,
-          grantedRefund?.id,
-        ),
+        availableQuantity: getLineAvailableQuantity({
+          lineId: line.id,
+          lineQuntity: line.quantity,
+          grantRefunds: order?.grantedRefunds,
+          grantRefundId: grantedRefund?.id,
+        }),
         unitPrice:
           "orderLine" in line
             ? line.orderLine.unitPrice.gross.amount

diff --git a/src/orders/components/OrderGrantRefundPage/utils.ts b/src/orders/components/OrderGrantRefundPage/utils.ts
@@ -40,16 +40,21 @@ export const prepareLineData = (lines: Map<string, ReducerOrderLine>): Line[] =>
       quantity: line.selectedQuantity,
     }));
 
-export const getLineAvailableQuantity = (
-  lineId: string,
-  lineQuntity: number,
-  grantRefunds: OrderDetailsGrantRefundFragment["grantedRefunds"],
-  grandRefundId?: string,
-) => {
+export const getLineAvailableQuantity = ({
+  lineId,
+  lineQuntity,
+  grantRefunds,
+  grantRefundId,
+}: {
+  lineId: string;
+  lineQuntity: number;
+  grantRefunds: OrderDetailsGrantRefundFragment["grantedRefunds"];
+  grantRefundId?: string;
+}) => {
   let refundedQuantity = 0;
 
   grantRefunds.forEach(refund => {
-    if (grandRefundId && refund.id === grandRefundId) {
+    if (grantRefundId && refund.id === grantRefundId) {
       return;
     }