From aaf3eb6562f158a740df572c059930f66b607305 Mon Sep 17 00:00:00 2001 From: ChiaChi Tsai Date: Mon, 29 Jan 2024 18:17:43 +0800 Subject: [PATCH 1/3] feature: add my assets on sidebar --- components/Sidebar.tsx | 76 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/components/Sidebar.tsx b/components/Sidebar.tsx index a5186d2c..f82fea96 100644 --- a/components/Sidebar.tsx +++ b/components/Sidebar.tsx @@ -17,6 +17,7 @@ import React, { useMemo, useState, } from "react"; +import { PREFERED_NETWORK } from "../context/config"; import { AppDispatchContext, AppStateContext, @@ -279,6 +280,81 @@ const Sidebar = ({
+ + + + + + + + All Assets + + + + + + + Date: Tue, 30 Jan 2024 11:35:21 +0800 Subject: [PATCH 2/3] fix: display params/tokens --- components/RenderProposalContentLambda.tsx | 40 +++++++++++++--------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/components/RenderProposalContentLambda.tsx b/components/RenderProposalContentLambda.tsx index 667a8d9c..eeb8a3f6 100644 --- a/components/RenderProposalContentLambda.tsx +++ b/components/RenderProposalContentLambda.tsx @@ -32,13 +32,23 @@ export type data = rawParams: undefined | string; } | { - type: "TransferFA2" | "TransferFA1_2" | "ApproveFA1_2"; + type: "TransferFA2"; label: undefined | string; metadata: undefined | string; amount: undefined | BigNumber; addresses: undefined | string; entrypoints: undefined | string; - params: undefined | fa2Tokens | fa1_2Token; + params: undefined | fa2Tokens; + rawParams: undefined | string; + } + | { + type: "TransferFA1_2" | "ApproveFA1_2"; + label: undefined | string; + metadata: undefined | string; + amount: undefined | BigNumber; + addresses: undefined | string; + entrypoints: undefined | string; + params: undefined | fa1_2Token; rawParams: undefined | string; } | { @@ -497,23 +507,19 @@ const RenderProposalContentLambda = ({ } mt-2 overflow-auto whitespace-pre-wrap rounded bg-zinc-900 px-4 py-4 font-light`} > {!!data.params ? ( - typeof data.params !== "string" ? ( - "fa1_2_address" in data.params ? ( - data.addresses?.at(0) && data.amount instanceof BigNumber ? ( - - ) : ( - JSON.stringify(data.params) - ) + data.type === "ApproveFA1_2" || data.type === "TransferFA1_2" ? ( + data.amount !== undefined ? ( + ) : ( - + JSON.stringify(data.params) ) - ) : data.type !== "ApproveFA1_2" && - data.type !== "TransferFA1_2" && - data.type !== "TransferFA2" ? ( + ) : data.type === "TransferFA2" ? ( + + ) : typeof data.params === "string" ? ( data.params ) : ( JSON.stringify(data.params) From 83a2843f0ee515cf6059618dc3e68a88a409feb2 Mon Sep 17 00:00:00 2001 From: Tsai ChiaChi Date: Tue, 30 Jan 2024 14:19:51 +0800 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Jules Guesnon <36401048+JulesGuesnon@users.noreply.github.com> --- components/Sidebar.tsx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/components/Sidebar.tsx b/components/Sidebar.tsx index f82fea96..29230062 100644 --- a/components/Sidebar.tsx +++ b/components/Sidebar.tsx @@ -300,12 +300,12 @@ const Sidebar = ({ height="14" rx="2" stroke="currentColor" - stroke-width="2" + strokeWidth="2" /> All Assets @@ -335,23 +335,23 @@ const Sidebar = ({