Merge branch 'staging' into makka/1132-fix-default-wallet-provider-icon

KlimaDAO · Nov 28, 2023 · bbed24b · bbed24b
2 parents 15f9920 + 5f2ded6
commit bbed24b
Show file tree

Hide file tree

Showing 55 changed files with 107 additions and 99 deletions.
diff --git a/app/locale/de/messages.po b/app/locale/de/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/app/locale/en-pseudo/messages.po b/app/locale/en-pseudo/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/app/locale/es/messages.po b/app/locale/es/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/app/locale/fr/messages.po b/app/locale/fr/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/app/locale/hi/messages.po b/app/locale/hi/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/app/locale/ko/messages.po b/app/locale/ko/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/app/locale/ru/messages.po b/app/locale/ru/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/app/locale/zh-CN/messages.po b/app/locale/zh-CN/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/carbon/locale/de/messages.po b/carbon/locale/de/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/carbon/locale/en-pseudo/messages.po b/carbon/locale/en-pseudo/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/carbon/locale/es/messages.po b/carbon/locale/es/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/carbon/locale/fr/messages.po b/carbon/locale/fr/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/carbon/locale/hi/messages.po b/carbon/locale/hi/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/carbon/locale/ko/messages.po b/carbon/locale/ko/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/carbon/locale/ru/messages.po b/carbon/locale/ru/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/carbon/locale/zh-CN/messages.po b/carbon/locale/zh-CN/messages.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2023-11-27 17:50+0000\n"
+"POT-Creation-Date: 2023-11-28 09:17+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/carbonmark/components/Dropdown/index.tsx b/carbonmark/components/Dropdown/index.tsx
@@ -3,7 +3,7 @@ import { t } from "@lingui/macro";
 import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
 import ArrowDropUpIcon from "@mui/icons-material/ArrowDropUp";
 import Tippy from "@tippyjs/react";
-import Image, { StaticImageData } from "next/legacy/image";
+import Image, { StaticImageData } from "next/image";
 import { FC, HTMLAttributes, ReactNode, useEffect, useState } from "react";
 import { Control, FieldValues, Path, useController } from "react-hook-form";
 import * as styles from "./styles";

diff --git a/carbonmark/components/ProjectImage/index.tsx b/carbonmark/components/ProjectImage/index.tsx
@@ -1,7 +1,7 @@
 import { getImageSizes } from "@klimadao/lib/utils";
 import { getCategoryInfo } from "lib/getCategoryInfo";
 import { CategoryName } from "lib/types/carbonmark.types";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import { FC } from "react";
 
 type Props = {
@@ -15,8 +15,8 @@ export const ProjectImage: FC<Props> = (props) => {
     <Image
       src={category.imageSrc}
       alt={category.label}
-      objectFit="cover"
-      layout="fill"
+      style={{ objectFit: "cover" }}
+      fill={true}
       sizes={getImageSizes({
         desktopLarge: "1116px",
       })}

diff --git a/carbonmark/components/pages/Blog/Post/index.tsx b/carbonmark/components/pages/Blog/Post/index.tsx
@@ -8,7 +8,7 @@ import PortableTextRenderer from "components/pages/Resources/PortableTextRendere
 import { Navigation } from "components/shared/Navigation";
 import { Post } from "lib/cms/queries";
 import { urls as carbonmarkUrls } from "lib/constants";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import defaultImage from "public/cover-default.png";
@@ -68,8 +68,10 @@ export const PostPage = (props: PostProps) => {
                 priority={true}
                 src={props.post.imageUrl || defaultImage}
                 alt={props.post.title}
-                objectFit="cover"
-                layout="fill"
+                fill={true}
+                style={{
+                  objectFit: "cover",
+                }}
               />
             </div>
           </div>

diff --git a/carbonmark/components/pages/Portfolio/Balances/index.tsx b/carbonmark/components/pages/Portfolio/Balances/index.tsx
@@ -6,7 +6,7 @@ import { getUSDCBalance } from "lib/actions";
 import { formatToPrice } from "lib/formatNumbers";
 import { carbonmarkTokenInfoMap } from "lib/getTokenInfo";
 import { Balance } from "lib/types/carbonmark.types";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import { useRouter } from "next/router";
 import { FC, useEffect, useState } from "react";
 import * as styles from "./styles";

diff --git a/carbonmark/components/pages/Project/Purchase/Listing/PurchaseInputs.tsx b/carbonmark/components/pages/Project/Purchase/Listing/PurchaseInputs.tsx
@@ -9,7 +9,7 @@ import { formatToPrice } from "lib/formatNumbers";
 import { carbonmarkPaymentMethodMap } from "lib/getPaymentMethods";
 import { LO } from "lib/luckyOrange";
 import { CarbonmarkPaymentMethod, Listing } from "lib/types/carbonmark.types";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import { useRouter } from "next/router";
 import { FC } from "react";
 import { SubmitHandler, useFormContext } from "react-hook-form";

diff --git a/carbonmark/components/pages/Project/Purchase/Listing/TotalValues.tsx b/carbonmark/components/pages/Project/Purchase/Listing/TotalValues.tsx
@@ -7,7 +7,7 @@ import { CARBONMARK_FEE, urls } from "lib/constants";
 import { formatToPrice, formatToTonnes } from "lib/formatNumbers";
 import { carbonmarkPaymentMethodMap } from "lib/getPaymentMethods";
 import { getTokenDecimals } from "lib/networkAware/getTokenDecimals";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import { useRouter } from "next/router";
 import { FC, useEffect } from "react";
 import { useFormContext, useWatch } from "react-hook-form";

diff --git a/carbonmark/components/pages/Project/Purchase/Pool/AssetDetails.tsx b/carbonmark/components/pages/Project/Purchase/Pool/AssetDetails.tsx
@@ -10,7 +10,7 @@ import { getPoolTokenType } from "lib/getPoolData";
 import { carbonTokenInfoMap } from "lib/getTokenInfo";
 import { createProjectTokenName } from "lib/projectGetter";
 import { DetailedProject, TokenPrice } from "lib/types/carbonmark.types";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import { useRouter } from "next/router";
 import { FC } from "react";
 import * as styles from "../styles";

diff --git a/carbonmark/components/pages/Project/Purchase/Pool/PurchaseInputs.tsx b/carbonmark/components/pages/Project/Purchase/Pool/PurchaseInputs.tsx
@@ -13,7 +13,7 @@ import {
   CarbonmarkPaymentMethod,
   TokenPrice,
 } from "lib/types/carbonmark.types";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import { useRouter } from "next/router";
 import { FC } from "react";
 import { SubmitHandler, useFormContext, useWatch } from "react-hook-form";

diff --git a/carbonmark/components/pages/Project/Purchase/Pool/SuccessScreen.tsx b/carbonmark/components/pages/Project/Purchase/Pool/SuccessScreen.tsx
@@ -14,7 +14,7 @@ import {
   DetailedProject,
   TokenPrice,
 } from "lib/types/carbonmark.types";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import Link from "next/link";
 import { FC } from "react";
 import * as styles from "../styles";

diff --git a/carbonmark/components/pages/Project/Purchase/Pool/TotalValues.tsx b/carbonmark/components/pages/Project/Purchase/Pool/TotalValues.tsx
@@ -8,7 +8,7 @@ import { CARBONMARK_FEE, urls } from "lib/constants";
 import { formatToPrice, formatToTonnes } from "lib/formatNumbers";
 import { carbonmarkPaymentMethodMap } from "lib/getPaymentMethods";
 import { TokenPrice } from "lib/types/carbonmark.types";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import { useRouter } from "next/router";
 import { FC, useEffect, useState } from "react";
 import { useFormContext, useWatch } from "react-hook-form";

diff --git a/carbonmark/components/pages/Project/Retire/Pool/AssetDetails.tsx b/carbonmark/components/pages/Project/Retire/Pool/AssetDetails.tsx
@@ -10,7 +10,7 @@ import { getPoolTokenType } from "lib/getPoolData";
 import { carbonTokenInfoMap } from "lib/getTokenInfo";
 import { createProjectTokenName } from "lib/projectGetter";
 import { DetailedProject, TokenPrice } from "lib/types/carbonmark.types";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import { useRouter } from "next/router";
 import { FC } from "react";
 import * as styles from "./styles";

diff --git a/carbonmark/components/pages/Project/Retire/Pool/RetireInputs.tsx b/carbonmark/components/pages/Project/Retire/Pool/RetireInputs.tsx
@@ -15,7 +15,7 @@ import {
   CarbonmarkPaymentMethod,
   TokenPrice as PriceType,
 } from "lib/types/carbonmark.types";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import { useRouter } from "next/router";
 import { FC, useEffect } from "react";
 import {

diff --git a/carbonmark/components/pages/Project/Retire/Pool/SuccessScreen.tsx b/carbonmark/components/pages/Project/Retire/Pool/SuccessScreen.tsx
@@ -6,7 +6,7 @@ import { Text } from "components/Text";
 import { urls } from "lib/constants";
 import { carbonmarkPaymentMethodMap } from "lib/getPaymentMethods";
 import { CarbonmarkPaymentMethod } from "lib/types/carbonmark.types";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import Link from "next/link";
 import { FC } from "react";
 import * as styles from "./styles";

diff --git a/carbonmark/components/pages/Project/Retire/Pool/TotalValues.tsx b/carbonmark/components/pages/Project/Retire/Pool/TotalValues.tsx
@@ -9,7 +9,7 @@ import { CARBONMARK_FEE, urls } from "lib/constants";
 import { formatToPrice, formatToTonnes } from "lib/formatNumbers";
 import { carbonmarkPaymentMethodMap } from "lib/getPaymentMethods";
 import { TokenPrice } from "lib/types/carbonmark.types";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import { useRouter } from "next/router";
 import { FC, useEffect, useState } from "react";
 import { useFormContext, useWatch } from "react-hook-form";

diff --git a/carbonmark/components/pages/Project/Retire/Pool/styles.ts b/carbonmark/components/pages/Project/Retire/Pool/styles.ts
@@ -337,7 +337,6 @@ export const iconFade = css`
   transition:
     opacity 800ms linear,
     display 800ms linear;
-  display: none;
   opacity: 0;
 `;
 

diff --git a/carbonmark/components/pages/Resources/BlogPostCard/index.tsx b/carbonmark/components/pages/Resources/BlogPostCard/index.tsx
@@ -1,7 +1,7 @@
 import { Trans } from "@lingui/macro";
 import { Text } from "components/Text";
 import { PostDetails } from "lib/cms/queries";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import defaultImage from "public/cover-default.png";
@@ -42,8 +42,10 @@ export const BlogPostCard = (props: BlogPostCardProps) => {
         <Image
           src={props.post.imageUrl || defaultImage}
           alt={props.post.title}
-          objectFit="cover"
-          layout="fill"
+          fill={true}
+          style={{
+            objectFit: "cover",
+          }}
         />
       </div>
     </Link>

diff --git a/carbonmark/components/pages/Resources/FeaturedArticles/Article.tsx b/carbonmark/components/pages/Resources/FeaturedArticles/Article.tsx
@@ -1,7 +1,7 @@
 import { Trans } from "@lingui/macro";
 import { Text } from "components/Text";
 import { FeaturedPost } from "lib/cms/queries";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import defaultImage from "public/cover-default.png";
@@ -24,8 +24,10 @@ export const Article: FC<Props> = (props) => {
       <Image
         alt={`${props.article.title} Image`}
         src={props.article.imageUrl || defaultImage}
-        layout="fill"
-        objectFit="cover"
+        fill={true}
+        style={{
+          objectFit: "cover",
+        }}
       />
       <div className="stack">
         <div className={styles.stackContent}>

diff --git a/carbonmark/components/pages/Resources/PortableTextRenderer/index.tsx b/carbonmark/components/pages/Resources/PortableTextRenderer/index.tsx
@@ -5,7 +5,7 @@ import {
   PortableTextProps,
 } from "@portabletext/react";
 import { Text } from "components/Text";
-import Image from "next/legacy/image";
+import Image from "next/image";
 import { FC } from "react";
 import * as styles from "./styles";
 
@@ -89,8 +89,10 @@ const components: PortableTextComponents = {
           <Image
             src={value.asset.url}
             alt="inline image"
-            objectFit="contain"
-            layout="responsive"
+            style={{
+              width: "100%",
+              height: "auto",
+            }}
             width={value.asset.width}
             height={value.asset.height}
           />

diff --git a/carbonmark/components/pages/Resources/PortableTextRenderer/styles.ts b/carbonmark/components/pages/Resources/PortableTextRenderer/styles.ts
@@ -28,6 +28,7 @@ export const blockQuote = css`
 
 export const inlineImage = css`
   margin: auto;
+  position: relative;
 `;
 
 export const link = css`

diff --git a/carbonmark/components/pages/Retirements/SingleRetirement/RetirementValue/index.tsx b/carbonmark/components/pages/Retirements/SingleRetirement/RetirementValue/index.tsx
@@ -1,7 +1,7 @@
 import { Text } from "@klimadao/lib/components";
 import { CarbonToken } from "@klimadao/lib/constants";
 import { Trans } from "@lingui/macro";
-import Image, { StaticImageData } from "next/legacy/image";
+import Image, { StaticImageData } from "next/image";
 import { FC } from "react";
 import * as styles from "./styles";
 

diff --git a/carbonmark/lib/getPaymentMethods.ts b/carbonmark/lib/getPaymentMethods.ts
@@ -1,5 +1,5 @@
 import { CarbonmarkPaymentMethod } from "lib/types/carbonmark.types";
-import { StaticImageData } from "next/legacy/image";
+import { StaticImageData } from "next/image";
 import FIAT from "public/icons/Fiat.png";
 import USDC from "public/icons/USDC.png";
 

diff --git a/carbonmark/lib/getTokenInfo.ts b/carbonmark/lib/getTokenInfo.ts
@@ -1,6 +1,6 @@
 import { CarbonToken } from "@klimadao/lib/constants";
 import { CarbonmarkToken } from "lib/types/carbonmark.types";
-import { StaticImageData } from "next/legacy/image";
+import { StaticImageData } from "next/image";
 import BCT from "public/icons/BCT.png";
 import C3T from "public/icons/C3T.png";
 import MCO2 from "public/icons/MCO2.png";