Additional PR feedback

anoma · Jul 27, 2023 · ef5f096 · ef5f096
1 parent ed9917b
commit ef5f096
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 23 deletions.
diff --git a/apps/extension/src/Approvals/Approvals.tsx b/apps/extension/src/Approvals/Approvals.tsx
@@ -25,11 +25,11 @@ export enum Status {
 }
 
 export type ApprovalDetails = {
-  source: string | null;
-  msgId: string | null;
-  txType: TxType | null;
-  publicKey: string | null;
-  target: string | null;
+  source: string;
+  msgId: string;
+  txType: TxType;
+  publicKey?: string;
+  target?: string;
 };
 
 export const Approvals: React.FC = () => {

diff --git a/apps/extension/src/Approvals/ApproveTx/ApproveTx.tsx b/apps/extension/src/Approvals/ApproveTx/ApproveTx.tsx
@@ -48,21 +48,23 @@ export const ApproveTx: React.FC<Props> = ({ setDetails }) => {
       ?.symbol || "";
 
   useEffect(() => {
-    setDetails({
-      source,
-      txType,
-      msgId,
-      publicKey,
-      target,
-    });
+    if (source && txType && msgId) {
+      setDetails({
+        source,
+        txType,
+        msgId,
+        publicKey,
+        target,
+      });
+    }
   }, [source, publicKey, txType, target, msgId]);
 
-  const handleApproveClick = (): void => {
+  const handleApproveClick = useCallback((): void => {
     if (accountType === AccountType.Ledger) {
       return navigate(`${TopLevelRoute.ConfirmLedgerTx}`);
     }
     navigate(TopLevelRoute.ConfirmTx);
-  };
+  }, [accountType]);
 
   const handleReject = useCallback(async (): Promise<void> => {
     try {

diff --git a/apps/extension/src/background/approvals/service.ts b/apps/extension/src/background/approvals/service.ts
@@ -27,7 +27,7 @@ export class ApprovalsService {
   ) {}
 
   // Deserialize transfer details and prompt user
-  async approveTransfer(txMsg: string, type?: AccountType): Promise<void> {
+  async approveTransfer(txMsg: string, type: AccountType): Promise<void> {
     const txMsgBuffer = Buffer.from(fromBase64(txMsg));
     const msgId = uuid();
     await this.txStore.set(msgId, txMsg);
@@ -52,7 +52,7 @@ export class ApprovalsService {
       target,
       tokenAddress,
       amount: amount.toString(),
-      accountType: type as string,
+      accountType: type,
       publicKey,
     });
 

diff --git a/apps/extension/src/hooks/useQuery.tsx b/apps/extension/src/hooks/useQuery.tsx
@@ -4,7 +4,7 @@ import { sanitize } from "dompurify";
 
 interface SanitizedURLSearchParams {
   get(name: string): string | null;
-  getAll(): Record<string, string | null>;
+  getAll(): Record<string, string>;
 }
 
 const toSanitized = (
@@ -14,12 +14,14 @@ const toSanitized = (
     const unsanitized = urlSearchParams.get(name);
     return unsanitized === null ? unsanitized : sanitize(unsanitized);
   },
-  getAll: (): Record<string, string | null> => {
-    const values: Record<string, string | null> = {};
+  getAll: (): Record<string, string> => {
+    const values: Record<string, string> = {};
 
     urlSearchParams.forEach((val, key) => {
       const unsanitized = val;
-      values[key] = unsanitized === null ? unsanitized : sanitize(unsanitized);
+      if (unsanitized) {
+        values[sanitize(key)] = sanitize(unsanitized);
+      }
     });
 
     return values;

diff --git a/apps/extension/src/provider/Namada.ts b/apps/extension/src/provider/Namada.ts
@@ -27,7 +27,7 @@ export class Namada implements INamada {
   constructor(
     private readonly _version: string,
     protected readonly requester?: MessageRequester
-  ) { }
+  ) {}
 
   public async connect(chainId: string): Promise<void> {
     return await this.requester?.sendMessage(
@@ -124,7 +124,7 @@ export class Namada implements INamada {
 
   public async submitTransfer(props: {
     txMsg: string;
-    type?: AccountType;
+    type: AccountType;
   }): Promise<void> {
     const { txMsg, type } = props;
     return await this.requester?.sendMessage(

diff --git a/apps/extension/src/provider/messages.ts b/apps/extension/src/provider/messages.ts
@@ -242,7 +242,7 @@ export class ApproveTransferMsg extends Message<void> {
 
   constructor(
     public readonly txMsg: string,
-    public readonly accountType?: AccountType
+    public readonly accountType: AccountType
   ) {
     super();
   }