Merge branch 'preview'

consolelabs · Apr 11, 2024 · 931943d · 931943d
2 parents 63b54cf + b863878
commit 931943d
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 47 deletions.
diff --git a/app/verify/page.tsx b/app/verify/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { Suspense, useCallback, useState } from "react";
+import { Suspense, useState } from "react";
 import { Header } from "@/components/header/header";
 import {
   Button,
@@ -15,22 +15,21 @@ import { LoginWidget } from "@mochi-web3/login-widget";
 import { useSearchParams } from "next/navigation";
 import { WretchError } from "wretch";
 import { API } from "@/constants/api";
+import { CheckCircleHalfColoredLine } from "@mochi-ui/icons";
 
 const Verify = () => {
   const { isOpen, onOpenChange } = useDisclosure();
   const searchParams = useSearchParams();
   const [loading, setLoading] = useState(false);
   const [verified, setVerified] = useState(false);
-  const [error, _setError] = useState("");
-  const setError = useCallback(
-    (e: WretchError) => {
-      _setError(e.json?.msg ?? "Something went wrong");
-    },
-    [_setError]
-  );
+  const [error, setError] = useState("");
 
   const code = searchParams.get("code");
   const guild_id = searchParams.get("guild_id");
+  const channel_id = searchParams.get("channel_id");
+  const author_id = searchParams.get("author_id");
+  const request_platform = searchParams.get("platform");
+  const request_application = searchParams.get("application");
 
   if (error) {
     return (
@@ -47,13 +46,16 @@ const Verify = () => {
 
   if (verified) {
     return (
-      <div className="py-8 px-8 mx-auto md:px-16 md:max-w-2xl min-h-[calc(100vh-56px)] flex flex-col items-center justify-center">
-        <div className="text-2xl font-black text-center md:text-3xl">
-          <span className="uppercase text-tono-gradient">
-            Your wallet is verified! You can close this window
-          </span>{" "}
-          ✨
+      <div className="w-full min-h-[calc(100vh-56px)] flex flex-col items-center justify-center text-center px-4 space-y-6">
+        <div className="rounded-full bg-success-plain-active w-24 h-24 flex items-center justify-center border-[16px] border-success-soft">
+          <CheckCircleHalfColoredLine className="w-10 h-10 text-success-solid" />
         </div>
+        <p className="text-2xl sm:text-3.5xl sm:leading-9 font-semibold text-text-primary">
+          You have connected your wallet.
+        </p>
+        <p className="text-base sm:text-lg text-text-primary">
+          Please close this window and go back to your Discord server.
+        </p>
       </div>
     );
   }
@@ -91,8 +93,13 @@ const Verify = () => {
                   if (!code || loading) return;
                   setLoading(true);
                   const payload = {
-                    wallet_address: address,
                     code,
+                    guild_id,
+                    channel_id,
+                    author_id,
+                    request_platform,
+                    request_application,
+                    wallet_address: address,
                     signature,
                     message:
                       "Please sign this message to prove wallet ownership",
@@ -105,31 +112,15 @@ const Verify = () => {
                       ""
                     )}`
                   )
-                    .badRequest(setError)
-                    .json(async (r) => {
-                      const user_discord_id = r.associated_accounts.find(
-                        (aa: any) => aa.platform === "discord"
-                      )?.platform_identifier;
-                      if (!guild_id) {
-                        setVerified(true);
-                      } else if (user_discord_id) {
-                        await API.MOCHI.post(
-                          {
-                            user_discord_id,
-                            guild_id,
-                          },
-                          `/verify/assign-role`
-                        )
-                          .badRequest(setError)
-                          .res(() => {
-                            setVerified(true);
-                          })
-                          .catch(setError)
-                          .finally(() => {
-                            setLoading(false);
-                            onOpenChange(false);
-                          });
-                      }
+                    .res(() => {
+                      setVerified(true);
+                    })
+                    .catch((e: WretchError) => {
+                      setError(e.json?.msg ?? "Something went wrong");
+                    })
+                    .finally(() => {
+                      setLoading(false);
+                      onOpenChange(false);
                     });
                 }}
               />

diff --git a/components/token-image.tsx b/components/token-image.tsx
@@ -1,4 +1,5 @@
 import useSWR from "swr";
+import wretch from "wretch";
 import Image from "next/image";
 
 interface Props {
@@ -10,7 +11,10 @@ export const TokenImage = (props: Props) => {
   const { symbol = "", size = 20 } = props;
   const { data } = useSWR(
     `https://api-preview.mochi.console.so/api/v1/product-metadata/emoji?codes=${symbol}`,
-    (url) => fetch(url).then((res) => res.json()),
+    (url) =>
+      wretch(url)
+        .get()
+        .json((res) => res.data),
     {
       revalidateIfStale: false,
       revalidateOnFocus: false,
@@ -21,7 +25,7 @@ export const TokenImage = (props: Props) => {
   return (
     <Image
       src={
-        data?.data[0]?.emoji_url ||
+        data?.[0]?.emoji_url ||
         "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk8AEAAFIATgDK/mEAAAAASUVORK5CYII="
       }
       alt={symbol}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stake-token",
-  "version": "1.2.0",
+  "version": "1.3.0-rc.1",
   "private": true,
   "scripts": {
     "dev": "next dev",

diff --git a/store/token-staking.ts b/store/token-staking.ts
@@ -1,4 +1,5 @@
 import { create } from "zustand";
+import wretch from "wretch";
 
 export interface Chain {
   id?: number;
@@ -52,10 +53,11 @@ const initialState: State = {
 export const useTokenStaking = create<State & Action>((set, get) => ({
   ...initialState,
   fetchStakingPools: async () => {
-    const response = await fetch(
+    const res = await wretch(
       "https://api-preview.tono.console.so/api/v1/guilds/462663954813157376/community/token/staking"
-    );
-    const json = await response.json();
-    set({ stakingPools: json?.data?.data || [] });
+    )
+      .get()
+      .json((res) => res?.data?.data);
+    set({ stakingPools: res || [] });
   },
 }));