2062 converted objects to interpolated strings (#2138)

Co-authored-by: Michael Collins <[email protected]> Co-authored-by: Atmosfearful <[email protected]>
KlimaDAO · Feb 16, 2024 · a43cf82 · a43cf82
1 parent 49c7190
commit a43cf82
Show file tree

Hide file tree

Showing 19 changed files with 50 additions and 198 deletions.
diff --git a/carbonmark/components/CreateListing/Form/index.tsx b/carbonmark/components/CreateListing/Form/index.tsx
@@ -82,17 +82,11 @@ export const CreateListingForm: FC<Props> = (props) => {
               ...register("amount", {
                 required: {
                   value: true,
-                  message: t({
-                    id: "user.listing.form.input.totalAmountToSell.required",
-                    message: "Total Amount to Sell is required",
-                  }),
+                  message: t`Total Amount to Sell is required`,
                 },
                 min: {
                   value: 1,
-                  message: t({
-                    id: "user.listing.form.input.totalAmountToSell.minimum",
-                    message: "The minimum amount to sell is 1 Tonne",
-                  }),
+                  message: t`The minimum amount to sell is 1 Tonne`,
                 },
                 max: {
                   value: Number(selectedAsset.amount),
@@ -127,12 +121,9 @@ export const CreateListingForm: FC<Props> = (props) => {
                 },
                 min: {
                   value: 0.1,
-                  message: t({
-                    id: "user.listing.form.input.singleUnitPrice.minimum",
-                    message: `The minimum price per tonne is ${MINIMUM_TONNE_PRICE.toLocaleString(
-                      locale
-                    )}`,
-                  }),
+                  message: t`The minimum price per tonne is ${MINIMUM_TONNE_PRICE.toLocaleString(
+                    locale
+                  )}`,
                 },
               }),
             }}

diff --git a/carbonmark/components/Layout/index.tsx b/carbonmark/components/Layout/index.tsx
@@ -48,24 +48,12 @@ export const Layout: FC<Props> = (props: Props) => {
       {renderModal &&
         renderModal({
           errors: getConnectErrorStrings(),
-          torusText: t({
-            message: "social or email",
-            id: "connectModal.torus",
-          }),
-          walletText: t({
-            message: "connect a wallet",
-            id: "connectModal.wallet",
-          }),
+          torusText: t`social or email`,
+          walletText: t`connect a wallet`,
           titles: {
             connect: t`Login`,
-            loading: t({
-              id: "connect_modal.connecting",
-              message: "Connecting...",
-            }),
-            error: t({
-              id: "connect_modal.error_title",
-              message: "Connection Error",
-            }),
+            loading: t`Connecting...`,
+            error: t`Connection Error`,
           },
         })}
     </>

diff --git a/carbonmark/components/pages/Portfolio/Retire/RetireForm/index.tsx b/carbonmark/components/pages/Portfolio/Retire/RetireForm/index.tsx
@@ -275,10 +275,7 @@ export const RetireForm = (props: RetireFormProps) => {
                       max: retirement.maxQuantity.toString(),
                       onChange: (event) =>
                         handleRetirementChange("quantity", event),
-                      placeholder: t({
-                        id: "offset.offset_quantity",
-                        message: "Enter quantity to offset",
-                      }),
+                      placeholder: t`Enter quantity to offset`,
                       value: retirement.quantity,
                     }}
                     label={"quantity"}
@@ -306,10 +303,7 @@ export const RetireForm = (props: RetireFormProps) => {
                         type: "text",
                         onChange: (event) =>
                           handleRetirementChange("beneficiaryName", event),
-                        placeholder: t({
-                          id: "offset.retirement_beneficiary_name",
-                          message: "Beneficiary Name",
-                        }),
+                        placeholder: t`Beneficiary Name`,
                         value: retirement.beneficiaryName,
                       }}
                       label={"beneficiaryName"}
@@ -323,9 +317,7 @@ export const RetireForm = (props: RetireFormProps) => {
                         type: "text",
                         onChange: (event) =>
                           handleRetirementChange("beneficiaryAddress", event),
-                        placeholder: t({
-                          message: "Beneficiary wallet address (optional)",
-                        }),
+                        placeholder: t`Beneficiary wallet address (optional)`,
                         value: retirement.beneficiaryAddress,
                       }}
                       label={"beneficiaryAddress"}
@@ -363,10 +355,7 @@ export const RetireForm = (props: RetireFormProps) => {
                     rows: 6,
                     onChange: (event) =>
                       handleRetirementChange("retirementMessage", event),
-                    placeholder: t({
-                      id: "offset.retirement_retirement_message",
-                      message: "Retirement Message",
-                    }),
+                    placeholder: t`Retirement Message`,
                     value: retirement.retirementMessage,
                   }}
                   label={""}
@@ -396,10 +385,7 @@ export const RetireForm = (props: RetireFormProps) => {
               <div className={styles.buttonRow}>
                 <div className={styles.buttonContainer}>
                   <CarbonmarkButton
-                    label={t({
-                      id: "retire.submit_button",
-                      message: "Retire Carbon",
-                    })}
+                    label={t`Retire Carbon`}
                     onClick={() => setRetireModalOpen(true)}
                     className={styles.submitButton}
                     disabled={!readyForRetireModal}

diff --git a/carbonmark/components/pages/Project/Purchase/Listing/PurchaseForm.tsx b/carbonmark/components/pages/Project/Purchase/Listing/PurchaseForm.tsx
@@ -102,12 +102,7 @@ export const PurchaseForm: FC<Props> = (props) => {
       setInputValues(values);
     } catch (e) {
       console.error(e);
-      setErrorMessage(
-        t({
-          id: "purchase.loading.allowance.error",
-          message: "something went wrong loading the allowance",
-        })
-      );
+      setErrorMessage(t`something went wrong loading the allowance`);
     } finally {
       setIsLoadingAllowance(false);
     }

diff --git a/carbonmark/components/pages/Project/Purchase/Listing/PurchaseInputs.tsx b/carbonmark/components/pages/Project/Purchase/Listing/PurchaseInputs.tsx
@@ -59,28 +59,19 @@ export const PurchaseInputs: FC<Props> = (props) => {
           <InputField
             id="amount"
             inputProps={{
-              placeholder: t({
-                id: "purchase.input.amount.placeholder",
-                message: "Tonnes",
-              }),
+              placeholder: t`Tonnes`,
               type: "number",
               min: 1,
               max: Number(props.listing.leftToSell),
               ...register("amount", {
                 onChange: () => clearErrors("price"),
                 required: {
                   value: true,
-                  message: t({
-                    id: "purchase.input.amount.required",
-                    message: "Amount is required",
-                  }),
+                  message: t`Amount is required`,
                 },
                 min: {
                   value: 1,
-                  message: t({
-                    id: "purchase.input.amount.minimum",
-                    message: "The minimum amount to buy is 1 Tonne",
-                  }),
+                  message: t`The minimum amount to buy is 1 Tonne`,
                 },
                 max: {
                   value: Number(props.listing.leftToSell),
@@ -166,17 +157,11 @@ export const PurchaseInputs: FC<Props> = (props) => {
           ...register("price", {
             required: {
               value: true,
-              message: t({
-                id: "purchase.input.price.required",
-                message: "Price is required",
-              }),
+              message: t`Price is required`,
             },
             max: {
               value: Number(props.balance || "0"),
-              message: t({
-                id: "purchase.input.price.maxAmount",
-                message: "You exceeded your available amount of tokens",
-              }),
+              message: t`You exceeded your available amount of tokens`,
             },
           }),
         }}

diff --git a/carbonmark/components/pages/Project/Purchase/Listing/PurchaseModal.tsx b/carbonmark/components/pages/Project/Purchase/Listing/PurchaseModal.tsx
@@ -80,17 +80,7 @@ export const PurchaseModal: FC<Props> = (props) => {
   const { networkLabel } = useWeb3();
   return (
     <Modal
-      title={
-        !props.isProcessing
-          ? t({
-              id: "purchase.transaction.modal.title.confirm",
-              message: "Confirm Purchase",
-            })
-          : t({
-              id: "purchase.transaction.modal.title.processing",
-              message: "Processing Purchase",
-            })
-      }
+      title={!props.isProcessing ? t`Confirm Purchase` : t`Processing Purchase`}
       showModal={props.showModal}
       onToggleModal={props.onModalClose}
     >

diff --git a/carbonmark/components/pages/Resources/ResourcesList/index.tsx b/carbonmark/components/pages/Resources/ResourcesList/index.tsx
@@ -159,19 +159,13 @@ export const ResourcesList: FC<Props> = (props) => {
               <InputField
                 id="search"
                 inputProps={{
-                  placeholder: t({
-                    id: "resources.form.input.search.placeholder",
-                    message: "Search...",
-                  }),
+                  placeholder: t`Search...`,
                   type: "search",
                   autoComplete: "off",
                   className: styles.searchInput,
                   ...register("search"),
                 }}
-                label={t({
-                  id: "resources.form.input.search.label",
-                  message: "Search",
-                })}
+                label={t`Search`}
                 hideLabel
               />
               <ButtonPrimary
@@ -197,10 +191,7 @@ export const ResourcesList: FC<Props> = (props) => {
                   ...register("sortedBy"),
                 }}
                 hideLabel
-                label={t({
-                  id: "resources.form.input.sort_by.label",
-                  message: "Sort by",
-                })}
+                label={t`Sort by`}
               />
               <Text t="body1">
                 <Trans id="shared.resources.sort_by.header">Sort by:</Trans>
@@ -271,10 +262,7 @@ export const ResourcesList: FC<Props> = (props) => {
       </div>
 
       <Modal
-        title={t({
-          id: "resources.mobile_modal.title",
-          message: "Sort By",
-        })}
+        title={t`Sort By`}
         showModal={showMobileModal}
         onToggleModal={() => setShowMobileModal((prev) => !prev)}
       >

diff --git a/carbonmark/components/pages/Resources/SortyByDropDown/index.tsx b/carbonmark/components/pages/Resources/SortyByDropDown/index.tsx
@@ -18,7 +18,7 @@ interface Props {
 
 const getSelectedSortyByLabel = (sortBy: string) =>
   (!!sortBy && getSortedByQueries().find((q) => q.value === sortBy)?.label) ||
-  t({ id: "resources.form.input.sort_by.select", message: "Select" });
+  t`Select`;
 
 export const SortyByDropDown: FC<Props> = (props) => {
   const sortedBy = useWatch({ name: "sortedBy", control: props.control });

diff --git a/carbonmark/components/pages/Retirements/SingleRetirement/BeneficiaryDetails/index.tsx b/carbonmark/components/pages/Retirements/SingleRetirement/BeneficiaryDetails/index.tsx
@@ -39,10 +39,7 @@ export const BeneficiaryDetails: FC<Props> = (props) => {
         <Text t="h4" className={styles.beneficiaryAddress}>
           {carbonmarkUser?.handle ||
             props.beneficiary ||
-            t({
-              id: "retirement.single.beneficiary.placeholder",
-              message: "No beneficiary name provided",
-            })}
+            t`No beneficiary name provided`}
         </Text>
         <A
           className={styles.profileLink}

diff --git a/carbonmark/components/pages/Retirements/SingleRetirement/ProjectDetails/index.tsx b/carbonmark/components/pages/Retirements/SingleRetirement/ProjectDetails/index.tsx
@@ -132,10 +132,7 @@ export const ProjectDetails: FC<Props> = (props) => {
             target="_blank"
             variant="transparent"
             rel="noopener noreferrer"
-            label={t({
-              id: "retirement.single.view_on_polygon_scan",
-              message: "View on Polygonscan",
-            })}
+            label={t`View on Polygonscan`}
             href={`https://polygonscan.com/tx/${props.retirement?.retire.hash}`}
           />
         )}

diff --git a/carbonmark/components/pages/Retirements/SingleRetirement/TransactionDetails/index.tsx b/carbonmark/components/pages/Retirements/SingleRetirement/TransactionDetails/index.tsx
@@ -37,10 +37,7 @@ export const TransactionDetails: FC<Props> = (props) => (
         </Text>
         <Text>
           {props.retirement.retire.beneficiaryAddress.id ||
-            t({
-              id: "retirement.single.beneficiary.address.placeholder",
-              message: "No beneficiary address available",
-            })}
+            t`No beneficiary address available`}
         </Text>
       </div>
       <div className={styles.textGroup}>
@@ -50,11 +47,7 @@ export const TransactionDetails: FC<Props> = (props) => (
           </Trans>
         </Text>
         <Text className={styles.transactionId}>
-          {props.retirement.retire?.hash ||
-            t({
-              id: "retirement.single.transaction_id.placeholder",
-              message: "No transaction id available",
-            })}
+          {props.retirement.retire?.hash || t`No transaction id available`}
         </Text>
       </div>
       <div className={styles.gridLayout}>

diff --git a/carbonmark/components/pages/Retirements/SingleRetirement/index.tsx b/carbonmark/components/pages/Retirements/SingleRetirement/index.tsx
@@ -125,10 +125,7 @@ export const SingleRetirementPage: NextPage<SingleRetirementPageProps> = ({
           id: "retirement.head.metaTitle",
           message: `${retiree} retired ${formattedAmount} Tonnes of carbon`,
         })}
-        metaDescription={t({
-          id: "retirement.head.metaDescription",
-          message: "Transparent, on-chain offsets powered by Carbonmark.",
-        })}
+        metaDescription={t`Transparent, on-chain offsets powered by Carbonmark.`}
         canonicalUrl={props.canonicalUrl}
       />
       <Navigation activePage="Home" />

diff --git a/carbonmark/components/pages/Retirements/index.tsx b/carbonmark/components/pages/Retirements/index.tsx
@@ -48,11 +48,7 @@ export const RetirementPage: NextPage<Props> = (props) => {
             nameserviceDomain || concattedAddress
           }`,
         })}
-        metaDescription={t({
-          id: "shared.head.description",
-          message:
-            "Drive climate action and earn rewards with a carbon-backed digital currency.",
-        })}
+        metaDescription={t`Drive climate action and earn rewards with a carbon-backed digital currency.`}
         canonicalUrl={props.canonicalUrl || undefined}
       />
       <Navigation activePage="Home" />

diff --git a/carbonmark/components/pages/Users/SellerConnected/Forms/EditListing.tsx b/carbonmark/components/pages/Users/SellerConnected/Forms/EditListing.tsx
@@ -105,17 +105,11 @@ export const EditListing: FC<Props> = (props) => {
               ...register("newQuantity", {
                 required: {
                   value: true,
-                  message: t({
-                    id: "user.listing.edit.input.quantity.required",
-                    message: "Quantity is required",
-                  }),
+                  message: t`Quantity is required`,
                 },
                 min: {
                   value: 1,
-                  message: t({
-                    id: "user.listing.edit.input.quantity.minimum",
-                    message: "The minimum quantity to sell is 1 tonne",
-                  }),
+                  message: t`The minimum quantity to sell is 1 tonne`,
                 },
                 max: {
                   value: Number(totalAvailableQuantity),
@@ -139,27 +133,18 @@ export const EditListing: FC<Props> = (props) => {
             id="price"
             label={t`New Unit Price (USDC)`}
             inputProps={{
-              placeholder: t({
-                id: "user.edit.form.edit.price.placeholder",
-                message: "USDC per ton",
-              }),
+              placeholder: t`USDC per ton`,
               type: "number",
               ...register("newSingleUnitPrice", {
                 required: {
                   value: true,
-                  message: t({
-                    id: "user.listing.form.input.singleUnitPrice.required",
-                    message: "Single Price is required",
-                  }),
+                  message: t`Single Price is required`,
                 },
                 min: {
                   value: MINIMUM_TONNE_PRICE,
-                  message: t({
-                    id: "user.listing.form.input.singleUnitPrice.minimum",
-                    message: `The minimum price per tonne is ${MINIMUM_TONNE_PRICE.toLocaleString(
-                      locale
-                    )}`,
-                  }),
+                  message: t`The minimum price per tonne is ${MINIMUM_TONNE_PRICE.toLocaleString(
+                    locale
+                  )}`,
                 },
                 pattern: {
                   value: /^\d+(\.\d{1,6})?$/,