fix: include anchorAccounts wherever account is used

labeleven-dev · Aug 14, 2022 · 5253081 · 5253081
1 parent 187abad
commit 5253081
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 19 deletions.
diff --git a/src/components/client/TransactionHeader.tsx b/src/components/client/TransactionHeader.tsx
@@ -100,6 +100,9 @@ export const TransactionHeader: React.FC<{ transaction: ITransaction }> = ({
             aria-label="Run Program"
             rightIcon={<Icon as={FaPlay} />}
             onClick={() => {
+              setUI((state) => {
+                state.transactionRun = DEFAULT_TRANSACTION_RUN;
+              });
               send(transaction);
             }}
           >

diff --git a/src/components/client/accounts/Account.tsx b/src/components/client/accounts/Account.tsx
@@ -32,11 +32,11 @@ import { PdaButton } from "./PdaButton";
 export const Account: React.FC<{
   account: IAccount;
   index: number;
-  locked?: boolean;
+  isAnchor?: boolean;
 }> = ({
   account: { id, name, pubkey, isWritable, isSigner },
   index,
-  locked = false,
+  isAnchor = false,
 }) => {
   const {
     instruction: { programId },
@@ -55,12 +55,13 @@ export const Account: React.FC<{
 
   const updateAccount = (fn: (state: WritableDraft<IAccount>) => void) => {
     update((state) => {
-      fn(state.accounts.map[id]);
+      fn(isAnchor ? state.anchorAccounts![index] : state.accounts.map[id]);
     });
   };
 
   const removeAccount = () => {
     update((state) => {
+      // no need for the anchor side since it is never deleted
       removeFrom(state.accounts, id);
     });
     if (hasPrivateKey) {
@@ -101,7 +102,7 @@ export const Account: React.FC<{
       <DragHandle
         unlockedProps={{ h: "2.5", w: "2.5" }}
         lockedProps={{ h: "3" }}
-        locked={locked}
+        locked={isAnchor}
       />
 
       <Numbering index={index} ml="2" minW="30px" fontSize="sm" />
@@ -114,7 +115,7 @@ export const Account: React.FC<{
         fontSize="sm"
         placeholder="Unnamed"
         tooltipProps={{ placement: "bottom-end" }}
-        isDisabled={locked}
+        isDisabled={isAnchor}
         value={name}
         onChange={(value: string) => {
           updateAccount((state) => {
@@ -213,7 +214,7 @@ export const Account: React.FC<{
         size="sm"
         label="Writable"
         icon={<EditIcon />}
-        isDisabled={!locked}
+        isDisabled={isAnchor}
         toggled={isWritable}
         onToggle={(toggled) => {
           updateAccount((state) => {
@@ -227,7 +228,7 @@ export const Account: React.FC<{
         size="sm"
         label="Signer"
         icon={<Icon as={FaPenNib} />}
-        isDisabled={locked}
+        isDisabled={isAnchor}
         toggled={isSigner}
         onToggle={(toggled) => {
           updateAccount((state) => {
@@ -236,7 +237,7 @@ export const Account: React.FC<{
         }}
       />
 
-      {!locked && (
+      {!isAnchor && (
         <Tooltip label="Remove">
           <IconButton
             ml="3"

diff --git a/src/components/client/accounts/Accounts.tsx b/src/components/client/accounts/Accounts.tsx
@@ -40,7 +40,7 @@ export const Accounts: React.FC<{
       {anchorAccounts?.map((account, index) => (
         <Account
           account={account}
-          locked={true}
+          isAnchor={true}
           index={index}
           key={account.id}
         />

diff --git a/src/components/client/results/Results.tsx b/src/components/client/results/Results.tsx
@@ -52,13 +52,15 @@ export const Results: React.FC = () => {
     (state) => state.transactionOptions.finality
   );
 
-  const setInProgress = useSessionStoreWithoutUndo(
-    (state) => (value: boolean) => {
-      state.set((state) => {
-        state.transactionRun.inProgress = value;
-      });
-    }
-  );
+  const [error, set] = useSessionStoreWithoutUndo((state) => [
+    state.transactionRun.error,
+    state.set,
+  ]);
+
+  const setInProgress = (value: boolean) =>
+    set((state) => {
+      state.transactionRun.inProgress = value;
+    });
 
   const {
     signature,
@@ -191,7 +193,7 @@ export const Results: React.FC = () => {
       </Flex>
 
       <ErrorAlert
-        error={results.error}
+        error={error || results.error}
         onClose={() => {
           setResults({ ...results, error: "" });
         }}

diff --git a/src/hooks/useSendWeb3Transaction.ts b/src/hooks/useSendWeb3Transaction.ts
@@ -41,7 +41,11 @@ export const useSendWeb3Transaction = ({
 
       // add additional signers
       const signerPubkeys = Object.values(transaction.instructions.map)
-        .flatMap((instruction) => Object.values(instruction.accounts.map))
+        .flatMap((instruction) =>
+          (instruction.anchorAccounts || []).concat(
+            Object.values(instruction.accounts.map)
+          )
+        )
         .filter((account) => account.isSigner && keypairs[account.pubkey])
         .map((account) => account.pubkey);
 
@@ -66,7 +70,10 @@ export const useSendWeb3Transaction = ({
 
       onSent && onSent(signature);
     } catch (err) {
-      onError && onError(new Error((err as { message: string }).message));
+      const message = Object.getOwnPropertyNames(err).includes("message")
+        ? (err as { message: string }).message
+        : JSON.stringify(err);
+      onError && onError(new Error(message));
     }
   };