app: rebase to fix translation conflicts (#2052)

KlimaDAO · Jan 22, 2024 · f1e848f · f1e848f · vercel · Jan 22, 2024
1 parent 3ae52b5
commit f1e848f
Show file tree

Hide file tree

Showing 63 changed files with 2,236 additions and 640 deletions.
diff --git a/carbonmark/.generated/carbonmark-api-sdk/schemas/Asset.json b/carbonmark/.generated/carbonmark-api-sdk/schemas/Asset.json
@@ -8,7 +8,8 @@
         "id": { "type": "string" },
         "name": { "type": "string" },
         "symbol": { "type": "string" },
-        "decimals": { "type": "number" }
+        "decimals": { "type": "number" },
+        "tokenId": { "type": "string" }
       },
       "required": ["id", "name", "symbol", "decimals"]
     },

diff --git a/carbonmark/.generated/carbonmark-api-sdk/schemas/Project.json b/carbonmark/.generated/carbonmark-api-sdk/schemas/Project.json
@@ -240,7 +240,9 @@
         "required": ["url", "caption"]
       }
     },
-    "hasSupply": { "type": "boolean" }
+    "hasSupply": { "type": "boolean" },
+    "tokenId": { "type": "string" },
+    "serialization": { "type": "string" }
   },
   "required": [
     "key",

diff --git a/carbonmark/.generated/carbonmark-api-sdk/schemas/Purchase.json b/carbonmark/.generated/carbonmark-api-sdk/schemas/Purchase.json
@@ -45,7 +45,11 @@
               "type": "string"
             },
             "projectID": { "examples": ["191"], "type": "string" },
-            "vintage": { "examples": ["2008"], "type": "string" }
+            "vintage": { "examples": ["2008"], "type": "string" },
+            "serialization": {
+              "examples": ["ICR-ISL-354-78040-14-R-0-2021"],
+              "type": "string"
+            }
           },
           "required": [
             "country",

diff --git a/carbonmark/.generated/carbonmark-api-sdk/schemas/User.json b/carbonmark/.generated/carbonmark-api-sdk/schemas/User.json
@@ -180,7 +180,8 @@
               "id": { "type": "string" },
               "name": { "type": "string" },
               "symbol": { "type": "string" },
-              "decimals": { "type": "number" }
+              "decimals": { "type": "number" },
+              "tokenId": { "type": "string" }
             },
             "required": ["id", "name", "symbol", "decimals"]
           },

diff --git a/carbonmark/.generated/carbonmark-api-sdk/types/Asset.ts b/carbonmark/.generated/carbonmark-api-sdk/types/Asset.ts
@@ -23,6 +23,10 @@ export type Asset = {
      * @type number
      */
     decimals: number;
+    /**
+     * @type string | undefined
+     */
+    tokenId?: string;
   };
   /**
    * @type string

diff --git a/carbonmark/.generated/carbonmark-api-sdk/types/GetProjects.ts b/carbonmark/.generated/carbonmark-api-sdk/types/GetProjects.ts
@@ -252,6 +252,14 @@ export type GetProjectsQueryResponse = {
    * @type boolean
    */
   hasSupply: boolean;
+  /**
+   * @type string | undefined
+   */
+  tokenId?: string;
+  /**
+   * @type string | undefined
+   */
+  serialization?: string;
 }[];
 
 export type GetProjectsQueryParams = {

diff --git a/carbonmark/.generated/carbonmark-api-sdk/types/GetProjectsId.ts b/carbonmark/.generated/carbonmark-api-sdk/types/GetProjectsId.ts
@@ -260,6 +260,14 @@ export type GetProjectsIdQueryResponse = {
    * @type boolean
    */
   hasSupply: boolean;
+  /**
+   * @type string | undefined
+   */
+  tokenId?: string;
+  /**
+   * @type string | undefined
+   */
+  serialization?: string;
 };
 
 export type GetProjectsIdQueryParams = {

diff --git a/carbonmark/.generated/carbonmark-api-sdk/types/GetPurchases.ts b/carbonmark/.generated/carbonmark-api-sdk/types/GetPurchases.ts
@@ -66,6 +66,10 @@ export type GetPurchasesQueryResponse = {
        * @type string
        */
       vintage: string;
+      /**
+       * @type string | undefined
+       */
+      serialization?: string;
     };
   };
   /**

diff --git a/carbonmark/.generated/carbonmark-api-sdk/types/GetPurchasesId.ts b/carbonmark/.generated/carbonmark-api-sdk/types/GetPurchasesId.ts
@@ -74,6 +74,10 @@ export type GetPurchasesIdQueryResponse = {
        * @type string
        */
       vintage: string;
+      /**
+       * @type string | undefined
+       */
+      serialization?: string;
     };
   };
   /**

diff --git a/carbonmark/.generated/carbonmark-api-sdk/types/GetUsersWalletorhandle.ts b/carbonmark/.generated/carbonmark-api-sdk/types/GetUsersWalletorhandle.ts
@@ -197,6 +197,10 @@ export type GetUsersWalletorhandleQueryResponse = {
        * @type number
        */
       decimals: number;
+      /**
+       * @type string | undefined
+       */
+      tokenId?: string;
     };
     /**
      * @type string

diff --git a/carbonmark/.generated/carbonmark-api-sdk/types/Project.ts b/carbonmark/.generated/carbonmark-api-sdk/types/Project.ts
@@ -245,4 +245,12 @@ export type Project = {
    * @type boolean
    */
   hasSupply: boolean;
+  /**
+   * @type string | undefined
+   */
+  tokenId?: string;
+  /**
+   * @type string | undefined
+   */
+  serialization?: string;
 };
diff --git a/carbonmark/.generated/carbonmark-api-sdk/types/Purchase.ts b/carbonmark/.generated/carbonmark-api-sdk/types/Purchase.ts
@@ -61,6 +61,10 @@ export type Purchase = {
        * @type string
        */
       vintage: string;
+      /**
+       * @type string | undefined
+       */
+      serialization?: string;
     };
   };
   /**

diff --git a/carbonmark/.generated/carbonmark-api-sdk/types/User.ts b/carbonmark/.generated/carbonmark-api-sdk/types/User.ts
@@ -184,6 +184,10 @@ export type User = {
        * @type number
        */
       decimals: number;
+      /**
+       * @type string | undefined
+       */
+      tokenId?: string;
     };
     /**
      * @type string

diff --git a/carbonmark/.generated/carbonmark-api.schema.json b/carbonmark/.generated/carbonmark-api.schema.json
@@ -2,7 +2,7 @@
   "openapi": "3.0.3",
   "info": {
     "title": "Carbonmark REST API",
-    "description": "\nWelcome to the API Reference docs for **version 5.2.1** of the Carbonmark REST API.\n\nUse this API to view assets, prices, supply, activity and more.\n\nLooking for the latest version? Visit our [GitHub Releases page](https://github.com/KlimaDAO/klimadao/releases).\n\n## Quick start\nBe sure to prefix a version number, otherwise your application will be exposed to breaking changes.\n\n~~~ts\nconst res = await fetch(\"https://v5.2.1.api.carbonmark.com/projects\");\nconst projects = await res.json();\n~~~\n\nFor a developer guides and example implementations, or to learn more about Carbonmark and Digital Carbon Market, view our product knowledge base at <a href=\"https://docs.carbonmark.com\">docs.carbonmark.com</a>.\n## \n",
+    "description": "\nWelcome to the API Reference docs for **version 5.3.0** of the Carbonmark REST API.\n\nUse this API to view assets, prices, supply, activity and more.\n\nLooking for the latest version? Visit our [GitHub Releases page](https://github.com/KlimaDAO/klimadao/releases).\n\n## Quick start\nBe sure to prefix a version number, otherwise your application will be exposed to breaking changes.\n\n~~~ts\nconst res = await fetch(\"https://v5.3.0.api.carbonmark.com/projects\");\nconst projects = await res.json();\n~~~\n\nFor a developer guides and example implementations, or to learn more about Carbonmark and Digital Carbon Market, view our product knowledge base at <a href=\"https://docs.carbonmark.com\">docs.carbonmark.com</a>.\n## \n",
     "termsOfService": "https://www.carbonmark.com/blog/terms-of-use",
     "contact": {
       "name": "Support",
@@ -12,7 +12,7 @@
       "name": "MIT",
       "url": "https://github.com/KlimaDAO/klimadao/blob/main/LICENSE"
     },
-    "version": "5.2.1"
+    "version": "5.3.0"
   },
   "components": {
     "schemas": {
@@ -488,6 +488,12 @@
           },
           "hasSupply": {
             "type": "boolean"
+          },
+          "tokenId": {
+            "type": "string"
+          },
+          "serialization": {
+            "type": "string"
           }
         },
         "required": [
@@ -1010,6 +1016,12 @@
                       "2008"
                     ],
                     "type": "string"
+                  },
+                  "serialization": {
+                    "examples": [
+                      "ICR-ISL-354-78040-14-R-0-2021"
+                    ],
+                    "type": "string"
                   }
                 },
                 "required": [
@@ -1460,6 +1472,9 @@
                     },
                     "decimals": {
                       "type": "number"
+                    },
+                    "tokenId": {
+                      "type": "string"
                     }
                   },
                   "required": [
@@ -1508,6 +1523,9 @@
               },
               "decimals": {
                 "type": "number"
+              },
+              "tokenId": {
+                "type": "string"
               }
             },
             "required": [
@@ -2592,6 +2610,12 @@
                       },
                       "hasSupply": {
                         "type": "boolean"
+                      },
+                      "tokenId": {
+                        "type": "string"
+                      },
+                      "serialization": {
+                        "type": "string"
                       }
                     },
                     "required": [
@@ -2720,6 +2744,12 @@
                                   "2008"
                                 ],
                                 "type": "string"
+                              },
+                              "serialization": {
+                                "examples": [
+                                  "ICR-ISL-354-78040-14-R-0-2021"
+                                ],
+                                "type": "string"
                               }
                             },
                             "required": [
@@ -3760,6 +3790,12 @@
                     },
                     "hasSupply": {
                       "type": "boolean"
+                    },
+                    "tokenId": {
+                      "type": "string"
+                    },
+                    "serialization": {
+                      "type": "string"
                     }
                   },
                   "required": [
@@ -3895,6 +3931,12 @@
                                 "2008"
                               ],
                               "type": "string"
+                            },
+                            "serialization": {
+                              "examples": [
+                                "ICR-ISL-354-78040-14-R-0-2021"
+                              ],
+                              "type": "string"
                             }
                           },
                           "required": [
@@ -4411,6 +4453,9 @@
                               },
                               "decimals": {
                                 "type": "number"
+                              },
+                              "tokenId": {
+                                "type": "string"
                               }
                             },
                             "required": [
@@ -4791,7 +4836,7 @@
   },
   "servers": [
     {
-      "url": "https://v5.2.1.api.carbonmark.com"
+      "url": "https://v5.3.0.api.carbonmark.com"
     }
   ],
   "externalDocs": {

diff --git a/carbonmark/components/Activities/Activity.tsx b/carbonmark/components/Activities/Activity.tsx
@@ -92,6 +92,10 @@ export const Activity = (props: Props) => {
     transactionString = <EastIcon />;
   }
 
+  const shouldDisplayActivity = amountA !== amountB;
+  if (!shouldDisplayActivity) {
+    return null;
+  }
   return (
     <div key={props.activity.id} className={styles.activity}>
       {project && (

diff --git a/carbonmark/components/AssetDetails/index.tsx b/carbonmark/components/AssetDetails/index.tsx
@@ -1,10 +1,12 @@
 import { cx } from "@emotion/css";
 import { Anchor } from "@klimadao/lib/components";
 import { PoolToken } from "@klimadao/lib/constants";
+import { useWeb3 } from "@klimadao/lib/utils";
 import { t } from "@lingui/macro";
 import LaunchIcon from "@mui/icons-material/Launch";
 import { Accordion } from "components/Accordion";
 import { Text } from "components/Text";
+import { getPolygonScanBaseUrl } from "lib/createUrls";
 import { formatToTonnes } from "lib/formatNumbers";
 import { getPoolTokenType } from "lib/getPoolData";
 import { carbonTokenInfoMap } from "lib/getTokenInfo";
@@ -20,11 +22,11 @@ type TotalValuesProps = {
   project: Project;
   actionLabel: string;
   availableLabel: string;
-  polyscanUrl: string;
 };
 
 export const AssetDetails: FC<TotalValuesProps> = (props) => {
   const { locale } = useRouter();
+  const { networkLabel } = useWeb3();
   const tokenType = getPoolTokenType(
     props.price.poolName.toUpperCase() as Uppercase<PoolToken>
   );
@@ -55,7 +57,12 @@ export const AssetDetails: FC<TotalValuesProps> = (props) => {
         </Text>
       </div>
       <div className={styles.totalsText}>
-        <Anchor className={styles.iconAndText} href={props.polyscanUrl}>
+        <Anchor
+          className={styles.iconAndText}
+          href={`${getPolygonScanBaseUrl(networkLabel)}/address/${
+            props.price.projectTokenAddress
+          }`}
+        >
           <Text className={styles.externalLink} t="body2">
             {t`View on PolygonScan`} <LaunchIcon />
           </Text>

diff --git a/carbonmark/components/CreateListing/Form/index.tsx b/carbonmark/components/CreateListing/Form/index.tsx
@@ -4,6 +4,7 @@ import { InputField } from "components/shared/Form/InputField";
 import { Text } from "components/Text";
 import { MINIMUM_TONNE_PRICE } from "lib/constants";
 import { Asset } from "lib/types/carbonmark.types";
+import { validateIcrAmount } from "lib/validateIcrAmount";
 import { useRouter } from "next/router";
 import { FC } from "react";
 import { SubmitHandler, useForm } from "react-hook-form";
@@ -14,6 +15,7 @@ export type FormValues = {
   amount: string;
   unitPrice: string;
   tokenAddress: string;
+  tokenId?: string;
 };
 
 type Props = {
@@ -24,6 +26,7 @@ type Props = {
 
 const defaultValues: FormValues = {
   tokenAddress: "",
+  tokenId: "",
   amount: "",
   unitPrice: "",
 };
@@ -39,7 +42,9 @@ export const CreateListingForm: FC<Props> = (props) => {
         tokenAddress:
           props.values?.tokenAddress.toLowerCase() ||
           props.assets[0].token.id.toLowerCase(),
+        tokenId: props.values?.tokenId || props.assets[0].token.tokenId,
       },
+      mode: "onChange",
     });
 
   const selectedAddress = watch("tokenAddress");
@@ -61,6 +66,7 @@ export const CreateListingForm: FC<Props> = (props) => {
         <ProjectTokenDropDown
           onTokenSelect={(asset) => {
             setValue("tokenAddress", asset.token.id.toLowerCase());
+            setValue("tokenId", asset.token.tokenId);
           }}
           assets={props.assets}
           selectedAsset={selectedAsset}
@@ -92,6 +98,10 @@ export const CreateListingForm: FC<Props> = (props) => {
                   value: Number(selectedAsset.amount),
                   message: t`Balance exceeded`,
                 },
+                validate: {
+                  isWholeNumber: (value) =>
+                    validateIcrAmount(value, selectedAsset.id),
+                },
               }),
             }}
             label={t`Quantity`}