From f5f216eca33959c7fd39adf11271cf2d66352576 Mon Sep 17 00:00:00 2001 From: Timur Carpeev Date: Tue, 6 Jun 2023 14:27:30 +0200 Subject: [PATCH] Remove misleading currency caption (#3620) * Remove misleading voucher value caption * Remove misleading order value caption * Remove misleading sale value caption * Remove misleading pricing card value caption * Remove misleading variant pricing card value caption * Extract messages * Update messages --------- Co-authored-by: andrzejewsky --- locale/defaultMessages.json | 18 ------------------ .../components/SaleValue/SaleValue.tsx | 10 ---------- .../VoucherRequirements.tsx | 6 ------ .../components/VoucherValue/VoucherValue.tsx | 6 ------ src/graphql/types.generated.ts | 2 +- .../ProductVariantPrice.tsx | 10 ---------- .../components/OrderValue/OrderValue.tsx | 8 -------- .../components/PricingCard/PricingCard.tsx | 8 -------- 8 files changed, 1 insertion(+), 67 deletions(-) diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json index 421672b64..00f2ffca2 100644 --- a/locale/defaultMessages.json +++ b/locale/defaultMessages.json @@ -3085,9 +3085,6 @@ "context": "delete attribute value", "string": "Are you sure you want to delete \"{name}\" value?" }, - "K+ROF8": { - "string": "Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency" - }, "K+vjtE": { "string": "Search Variants" }, @@ -4691,10 +4688,6 @@ "context": "header", "string": "Order settings" }, - "VvA7ai": { - "context": "info text", - "string": "Channels that don’t have assigned prices will use their parent channel to define the price. Price will be converted to channel’s currency" - }, "VvFJ/T": { "context": "PageTypeDeleteWarningDialog single no assigned items description", "string": "Are you sure you want to delete {typeName}? If you remove it you won’t be able to assign it to created pages." @@ -5691,10 +5684,6 @@ "cdxwA8": { "string": "{amount, plural,one {One product out of stock}other {{amount} products out of stock}}" }, - "cehiWu": { - "context": "channels sale info", - "string": "Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency" - }, "cfQf0w": { "context": "button", "string": "Create Order" @@ -7440,9 +7429,6 @@ "context": "bulk delete label", "string": "Delete" }, - "qnPzX7": { - "string": "Channels that don’t have assigned discounts will use their parent channel to define the value. Value will be converted to channel’s currency" - }, "qov29K": { "context": "dialog content", "string": "Select one of customer addresses or add a new address:" @@ -7899,10 +7885,6 @@ "context": "independent of any particular day, eg. 11:35", "string": "Time" }, - "u5c/tR": { - "context": "channels discount info", - "string": "Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency" - }, "u9/vj9": { "context": "webhook input label", "string": "Target URL" diff --git a/src/discounts/components/SaleValue/SaleValue.tsx b/src/discounts/components/SaleValue/SaleValue.tsx index 7787f4028..34c2fd6e2 100644 --- a/src/discounts/components/SaleValue/SaleValue.tsx +++ b/src/discounts/components/SaleValue/SaleValue.tsx @@ -8,7 +8,6 @@ import { getFormErrors } from "@dashboard/utils/errors"; import getDiscountErrorMessage from "@dashboard/utils/errors/discounts"; import { Card, - CardContent, TableBody, TableCell, TableHead, @@ -51,15 +50,6 @@ const SaleValue: React.FC = ({ description: "sale value, header", })} /> - - - - - diff --git a/src/discounts/components/VoucherRequirements/VoucherRequirements.tsx b/src/discounts/components/VoucherRequirements/VoucherRequirements.tsx index e227558cc..7b7b135b2 100644 --- a/src/discounts/components/VoucherRequirements/VoucherRequirements.tsx +++ b/src/discounts/components/VoucherRequirements/VoucherRequirements.tsx @@ -102,12 +102,6 @@ const VoucherRequirements = ({ ) && } {data.requirementsPicker === RequirementsPicker.ORDER ? ( <> - - -
= props => { })} /> - - -
diff --git a/src/graphql/types.generated.ts b/src/graphql/types.generated.ts index 3eaca855b..f44aea3a3 100644 --- a/src/graphql/types.generated.ts +++ b/src/graphql/types.generated.ts @@ -10840,4 +10840,4 @@ export type WarehouseDetailsQuery = { __typename: 'Query', warehouse: { __typena export type WarehousesCountQueryVariables = Exact<{ [key: string]: never; }>; -export type WarehousesCountQuery = { __typename: 'Query', warehouses: { __typename: 'WarehouseCountableConnection', totalCount: number | null } | null }; +export type WarehousesCountQuery = { __typename: 'Query', warehouses: { __typename: 'WarehouseCountableConnection', totalCount: number | null } | null }; \ No newline at end of file diff --git a/src/products/components/ProductVariantPrice/ProductVariantPrice.tsx b/src/products/components/ProductVariantPrice/ProductVariantPrice.tsx index d85e53925..7120a285d 100644 --- a/src/products/components/ProductVariantPrice/ProductVariantPrice.tsx +++ b/src/products/components/ProductVariantPrice/ProductVariantPrice.tsx @@ -83,16 +83,6 @@ export const ProductVariantPrice: React.FC< description: "product pricing, section header", })} - - - {intl.formatMessage({ - id: "VvA7ai", - defaultMessage: - "Channels that don’t have assigned prices will use their parent channel to define the price. Price will be converted to channel’s currency", - description: "info text", - })} - - diff --git a/src/shipping/components/OrderValue/OrderValue.tsx b/src/shipping/components/OrderValue/OrderValue.tsx index 6099b88a2..2447ec0f6 100644 --- a/src/shipping/components/OrderValue/OrderValue.tsx +++ b/src/shipping/components/OrderValue/OrderValue.tsx @@ -5,7 +5,6 @@ import PriceField from "@dashboard/components/PriceField"; import ResponsiveTable from "@dashboard/components/ResponsiveTable"; import TableHead from "@dashboard/components/TableHead"; import TableRowLink from "@dashboard/components/TableRowLink"; -import VerticalSpacer from "@dashboard/components/VerticalSpacer"; import { ShippingChannelsErrorFragment } from "@dashboard/graphql"; import { ChangeEvent } from "@dashboard/hooks/useForm"; import { @@ -82,13 +81,6 @@ export const OrderValue: React.FC = ({ onChange={onChange} disabled={disabled} /> - - -
{orderValueRestricted && ( diff --git a/src/shipping/components/PricingCard/PricingCard.tsx b/src/shipping/components/PricingCard/PricingCard.tsx index 57d074bfa..9da8bc114 100644 --- a/src/shipping/components/PricingCard/PricingCard.tsx +++ b/src/shipping/components/PricingCard/PricingCard.tsx @@ -57,14 +57,6 @@ export const PricingCard: React.FC = ({ })} /> - - {intl.formatMessage({ - id: "VvA7ai", - defaultMessage: - "Channels that don’t have assigned prices will use their parent channel to define the price. Price will be converted to channel’s currency", - description: "info text", - })} -