Skip to content

Commit cf8faff

Browse files
committed
fix: Cleanup unused functions and only use convert to locale for money formatting
1 parent 4e85fb8 commit cf8faff

File tree

9 files changed

+79
-300
lines changed

9 files changed

+79
-300
lines changed

src/lib/util/get-number-of-skeletons.ts

-25
This file was deleted.

src/lib/util/prices.ts

-235
This file was deleted.

src/modules/account/components/order-card/index.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useMemo } from "react"
44

55
import Thumbnail from "@modules/products/components/thumbnail"
66
import LocalizedClientLink from "@modules/common/components/localized-client-link"
7-
import { formatAmount } from "@lib/util/prices"
7+
import { convertToLocale } from "@lib/util/money"
88

99
type OrderCardProps = {
1010
order: Omit<Order, "beforeInsert">
@@ -31,10 +31,9 @@ const OrderCard = ({ order }: OrderCardProps) => {
3131
{new Date(order.created_at).toDateString()}
3232
</span>
3333
<span className="px-2" data-testid="order-amount">
34-
{formatAmount({
34+
{convertToLocale({
3535
amount: order.total,
36-
region: order.region,
37-
includeTaxes: false,
36+
currency_code: order.region.currency_code,
3837
})}
3938
</span>
4039
<span className="pl-2">{`${numberOfLines} ${

src/modules/account/components/overview/index.tsx

+42-12
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Customer, Order } from "@medusajs/medusa"
22
import { Container } from "@medusajs/ui"
3-
import { formatAmount } from "@lib/util/prices"
43

54
import ChevronDown from "@modules/common/icons/chevron-down"
65
import LocalizedClientLink from "@modules/common/components/localized-client-link"
6+
import { convertToLocale } from "@lib/util/money"
77

88
type OverviewProps = {
99
customer: Omit<Customer, "password_hash"> | null
@@ -15,10 +15,18 @@ const Overview = ({ customer, orders }: OverviewProps) => {
1515
<div data-testid="overview-page-wrapper">
1616
<div className="hidden small:block">
1717
<div className="text-xl-semi flex justify-between items-center mb-4">
18-
<span data-testid="welcome-message" data-value={customer?.first_name}>Hello {customer?.first_name}</span>
18+
<span data-testid="welcome-message" data-value={customer?.first_name}>
19+
Hello {customer?.first_name}
20+
</span>
1921
<span className="text-small-regular text-ui-fg-base">
2022
Signed in as:{" "}
21-
<span className="font-semibold" data-testid="customer-email" data-value={customer?.email}>{customer?.email}</span>
23+
<span
24+
className="font-semibold"
25+
data-testid="customer-email"
26+
data-value={customer?.email}
27+
>
28+
{customer?.email}
29+
</span>
2230
</span>
2331
</div>
2432
<div className="flex flex-col py-8 border-t border-gray-200">
@@ -27,7 +35,11 @@ const Overview = ({ customer, orders }: OverviewProps) => {
2735
<div className="flex flex-col gap-y-4">
2836
<h3 className="text-large-semi">Profile</h3>
2937
<div className="flex items-end gap-x-2">
30-
<span className="text-3xl-semi leading-none" data-testid="customer-profile-completion" data-value={getProfileCompletion(customer)}>
38+
<span
39+
className="text-3xl-semi leading-none"
40+
data-testid="customer-profile-completion"
41+
data-value={getProfileCompletion(customer)}
42+
>
3143
{getProfileCompletion(customer)}%
3244
</span>
3345
<span className="uppercase text-base-regular text-ui-fg-subtle">
@@ -39,7 +51,11 @@ const Overview = ({ customer, orders }: OverviewProps) => {
3951
<div className="flex flex-col gap-y-4">
4052
<h3 className="text-large-semi">Addresses</h3>
4153
<div className="flex items-end gap-x-2">
42-
<span className="text-3xl-semi leading-none" data-testid="addresses-count" data-value={customer?.shipping_addresses?.length || 0}>
54+
<span
55+
className="text-3xl-semi leading-none"
56+
data-testid="addresses-count"
57+
data-value={customer?.shipping_addresses?.length || 0}
58+
>
4359
{customer?.shipping_addresses?.length || 0}
4460
</span>
4561
<span className="uppercase text-base-regular text-ui-fg-subtle">
@@ -53,11 +69,18 @@ const Overview = ({ customer, orders }: OverviewProps) => {
5369
<div className="flex items-center gap-x-2">
5470
<h3 className="text-large-semi">Recent orders</h3>
5571
</div>
56-
<ul className="flex flex-col gap-y-4" data-testid="orders-wrapper">
72+
<ul
73+
className="flex flex-col gap-y-4"
74+
data-testid="orders-wrapper"
75+
>
5776
{orders && orders.length > 0 ? (
5877
orders.slice(0, 5).map((order) => {
5978
return (
60-
<li key={order.id} data-testid="order-wrapper" data-value={order.id}>
79+
<li
80+
key={order.id}
81+
data-testid="order-wrapper"
82+
data-value={order.id}
83+
>
6184
<LocalizedClientLink
6285
href={`/account/orders/details/${order.id}`}
6386
>
@@ -73,16 +96,23 @@ const Overview = ({ customer, orders }: OverviewProps) => {
7396
<span data-testid="order-created-date">
7497
{new Date(order.created_at).toDateString()}
7598
</span>
76-
<span data-testid="order-id" data-value={order.display_id}>#{order.display_id}</span>
99+
<span
100+
data-testid="order-id"
101+
data-value={order.display_id}
102+
>
103+
#{order.display_id}
104+
</span>
77105
<span data-testid="order-amount">
78-
{formatAmount({
106+
{convertToLocale({
79107
amount: order.total,
80-
region: order.region,
81-
includeTaxes: false,
108+
currency_code: order.region.currency_code,
82109
})}
83110
</span>
84111
</div>
85-
<button className="flex items-center justify-between" data-testid="open-order-button">
112+
<button
113+
className="flex items-center justify-between"
114+
data-testid="open-order-button"
115+
>
86116
<span className="sr-only">
87117
Go to order #{order.display_id}
88118
</span>

0 commit comments

Comments
 (0)