Merge branch 'jules/feat/simulated-poe' of https://github.com/marigol…

…d-dev/tzsafe-ui into jules/feat/simulated-poe
marigold-dev · Jan 31, 2024 · 36b2a2c · 36b2a2c
2 parents b1871e5 + 750605d
commit 36b2a2c
Show file tree

Hide file tree

Showing 33 changed files with 1,924 additions and 272 deletions.
diff --git a/assets/images/objkt.png b/assets/images/objkt.png
diff --git a/components/Alias.tsx b/components/Alias.tsx
@@ -14,7 +14,6 @@ const Alias = ({
   disabled?: boolean;
 }) => {
   const state = useContext(AppStateContext)!;
-
   const formatted = useMemo(
     () =>
       `${(address ?? "").substring(0, length)}...${(address ?? "").substring(

diff --git a/components/Copy.tsx b/components/Copy.tsx
@@ -28,7 +28,8 @@ const Copy = ({ children, value, disabled = false, text }: copyProps) => {
       <a
         href="#"
         className={disabled ? "cursor-default" : ""}
-        onClick={async () => {
+        onClick={async e => {
+          e.preventDefault();
           if (disabled) return;
 
           setIsCopying(true);

diff --git a/components/FA1_2.tsx b/components/FA1_2.tsx
@@ -28,7 +28,7 @@ export type fa1_2Token = {
     tokenId: "0";
     standard: "fa1.2";
     totalSupply: string;
-    metadata: {
+    metadata?: {
       name: string;
       symbol: string;
       decimals: string;
@@ -57,13 +57,13 @@ const FETCH_COUNT = 20;
 
 const tokenToOption = (fa1_2Token: fa1_2Token) => {
   const { token } = fa1_2Token;
-  const imageUri = token.metadata.thumbnailUri ?? "";
+  const imageUri = token.metadata?.thumbnailUri ?? "";
 
   return {
     id: token.id.toString(),
     tokenId: token.tokenId,
     value: token.id.toString(),
-    label: token.metadata.name,
+    label: token.metadata?.name ?? "No name",
     image: imageUri.includes("http")
       ? imageUri
       : imageUri === ""

diff --git a/components/FA2Transfer.tsx b/components/FA2Transfer.tsx
@@ -28,7 +28,7 @@ export type fa2Token = {
   token: {
     id: number;
     contract: { address: string };
-    metadata: {
+    metadata?: {
       name: string;
       symbol: string;
       decimals: string;
@@ -56,13 +56,13 @@ const FETCH_COUNT = 20;
 const tokenToOption = (fa2Token: fa2Token) => {
   const { token } = fa2Token;
   const imageUri =
-    token.metadata.thumbnailUri ?? token.metadata.displayUri ?? "";
+    token.metadata?.thumbnailUri ?? token.metadata?.displayUri ?? "";
 
   return {
     id: token.id.toString(),
     tokenId: token.tokenId,
     value: token.id.toString(),
-    label: token.metadata.name,
+    label: token.metadata?.name ?? "No name",
     image: imageUri.includes("http")
       ? imageUri
       : imageUri === ""
@@ -183,10 +183,8 @@ const FA2Transfer = ({
     if (!currentToken) return;
 
     return BigNumber(currentToken.balance)
-      .div(BigNumber(10).pow(currentToken.token.metadata.decimals))
+      .div(BigNumber(10).pow(currentToken.token.metadata?.decimals ?? 0))
       .toNumber();
-
-    return;
   }, [currentToken]);
 
   return (
@@ -242,7 +240,7 @@ const FA2Transfer = ({
               if (!currentToken) return;
 
               if (
-                currentToken.token.metadata.decimals === "0" &&
+                currentToken.token.metadata?.decimals === "0" &&
                 !Number.isInteger(amount)
               ) {
                 return "Amount must be an integer";

diff --git a/components/HistoryFaToken.tsx b/components/HistoryFaToken.tsx
@@ -61,9 +61,9 @@ const HistoryFaToken = ({ transferType, token }: props) => {
         <span className="truncate font-light text-zinc-300 md:min-w-[7rem]">
           <span className="hidden md:inline">Amount:</span>{" "}
           {BigNumber(token.amount)
-            .div(BigNumber(10).pow(token.token.metadata.decimals))
+            .div(BigNumber(10).pow(token.token.metadata?.decimals ?? 0))
             .toNumber()}{" "}
-          {token.token.metadata.symbol}
+          {token.token.metadata?.symbol ?? ""}
         </span>
         <span className="hidden justify-self-end lg:block">
           {tzDate} - {`${tzHours}:${tzMinutes}`}
@@ -78,7 +78,7 @@ const HistoryFaToken = ({ transferType, token }: props) => {
         <ul className="font-light">
           <li>
             <span className="text-zinc-400">Full name:</span>{" "}
-            {token.token.metadata.name}
+            {token.token.metadata?.name ?? "No name"}
           </li>
           <li>
             <span className="text-zinc-400">Token ID:</span>{" "}

diff --git a/components/LoginModal.tsx b/components/LoginModal.tsx
@@ -5,10 +5,9 @@ import { decodeData } from "../pages/[walletAddress]/beacon";
 import { connectWallet } from "../utils/connectWallet";
 import { signers } from "../versioned/apis";
 import { p2pData } from "../versioned/interface";
-import { hasTzip27SupportWithPoEChallenge } from "../versioned/util";
+import { hasTzip27Support } from "../versioned/util";
 import Select from "./Select";
 import Spinner from "./Spinner";
-import LoginButton from "./loginButton";
 
 enum State {
   INITIAL,
@@ -30,8 +29,7 @@ const LoginModal = ({ data, onEnd }: { data: string; onEnd: () => void }) => {
     if (!state.address) return [];
 
     return Object.keys(state.contracts).flatMap(address => {
-      if (!hasTzip27SupportWithPoEChallenge(state.contracts[address].version))
-        return [];
+      if (!hasTzip27Support(state.contracts[address].version)) return [];
 
       if (!signers(state.contracts[address]).includes(state.address!))
         return [];
@@ -107,12 +105,13 @@ const LoginModal = ({ data, onEnd }: { data: string; onEnd: () => void }) => {
                 return (
                   <>
                     <h1 className="text-center text-lg font-medium">
-                      You don{"'"}t have any wallet that is compatible with
-                      Tzip27
+                      No Available Wallet for Dapp Connection
                     </h1>
                     <p className="mt-2 text-center text-sm text-zinc-400">
-                      Please create or import a wallet before trying to connect
-                      with Beacon
+                      Ensure you have a wallet version of 0.3.3 or higher. If
+                      not, please create and import a new one to access all
+                      available features. Once this is done, proceed to connect
+                      with the Dapp again.
                     </p>
                     <div className="mt-4 flex justify-center">
                       <button
@@ -221,7 +220,7 @@ const LoginModal = ({ data, onEnd }: { data: string; onEnd: () => void }) => {
               return (
                 <>
                   <h1 className="text-center text-lg font-medium">
-                    Successfuly connected to {parsedData?.name ?? "Dapp"}
+                    Successfully connected to {parsedData?.name ?? "Dapp"}
                   </h1>
                   <div className="mt-4 flex justify-center">
                     <button
@@ -238,9 +237,12 @@ const LoginModal = ({ data, onEnd }: { data: string; onEnd: () => void }) => {
               return (
                 <>
                   <h1 className="text-center text-lg font-medium">
-                    You need to connect first before establishing a connection
-                    with the dApp
+                    Owner Login Not Detected
                   </h1>
+                  <p className="mt-2 text-center text-sm text-zinc-400">
+                    To establish a connection with a DApp using TzSafe, select a
+                    wallet other than TzSafe itself to log in TzSafe.
+                  </p>
                   <div className="mt-4 flex w-full items-center justify-center space-x-4">
                     <button
                       className="rounded border bg-transparent px-4 py-2 font-medium text-white "