fix: make currency not optional

to do with #810
funmusicplace · Aug 21, 2024 · 8edd651 · 8edd651
1 parent 429cff2
commit 8edd651
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/client/src/components/Admin/AdminPurchases.tsx b/client/src/components/Admin/AdminPurchases.tsx
@@ -78,7 +78,7 @@ export const AdminPurchases: React.FC = () => {
           {Object.keys(total).map((currency) => (
             <tr key={currency}>
               <td>{currency}</td>
-              <Money amount={total[currency] / 100} />
+              <Money amount={total[currency] / 100} currency={currency} />
             </tr>
           ))}
         </tbody>

diff --git a/client/src/components/common/Money.tsx b/client/src/components/common/Money.tsx
@@ -1,9 +1,9 @@
 export const moneyDisplay = ({
   amount,
-  currency = "USD",
+  currency,
 }: {
   amount?: number | string;
-  currency?: string;
+  currency: string;
 }) => {
   if (!amount) {
     return "-";
@@ -16,8 +16,8 @@ export const moneyDisplay = ({
 
 export const Money: React.FC<{
   amount?: number | string;
-  currency?: string;
-}> = ({ amount, currency = "USD" }) => {
+  currency: string;
+}> = ({ amount, currency }) => {
   return <>{moneyDisplay({ amount, currency })}</>;
 };
 

diff --git a/client/src/components/common/PlatformPercent.tsx b/client/src/components/common/PlatformPercent.tsx
@@ -6,7 +6,7 @@ import { css } from "@emotion/css";
 const PlatformPercent: React.FC<{
   percent: number;
   chosenPrice?: string | number;
-  currency?: string;
+  currency: string;
   artist?: Pick<Artist, "name">;
 }> = ({ percent, chosenPrice, currency = "USD", artist }) => {
   const chosenNumber =

diff --git a/client/src/components/common/SupportArtistPopUpTiers.tsx b/client/src/components/common/SupportArtistPopUpTiers.tsx
@@ -47,7 +47,7 @@ const ListItem = styled.li`
 const SupportArtistPopUpTiers = forwardRef<
   HTMLInputElement,
   {
-    options: Partial<ArtistSubscriptionTier>[];
+    options: ArtistSubscriptionTier[];
   }
 >(function ({ options, ...props }, ref) {
   const { t } = useTranslation("translation", { keyPrefix: "artist" });

diff --git a/client/src/components/common/TipArtistForm.tsx b/client/src/components/common/TipArtistForm.tsx
@@ -126,7 +126,7 @@ const TipArtistForm: React.FC<{
                 id={`priceButton-${gift.value}`}
               />
               <label htmlFor={`priceButton-${gift.value}`}>
-                {gift.value !== "other"
+                {currency && gift.value !== "other"
                   ? moneyDisplay({
                       amount: gift.value,
                       currency,
@@ -165,12 +165,13 @@ const TipArtistForm: React.FC<{
           width: 100% !important;
         `}
       >
-        {t(!actualValue ? "enterGiftAmount" : "giveOnce", {
-          amount: moneyDisplay({
-            amount: actualValue,
-            currency,
-          }),
-        })}
+        {currency &&
+          t(!actualValue ? "enterGiftAmount" : "giveOnce", {
+            amount: moneyDisplay({
+              amount: actualValue,
+              currency,
+            }),
+          })}
       </Button>
     </div>
   );