Merge pull request #352 from arconnectio/development

ArConnect BETA 1.12.1

assets/_locales/en/messages.json

@@ -1762,10 +1762,18 @@
     "message": "Token Already Added",
     "description": "token already imported"
   },
+  "token_already_removed": {
+    "message": "Token Already Removed",
+    "description": "token already removed"
+  },
   "token_imported": {
     "message": "Token Succesfully Added",
     "description": "token added"
   },
+  "token_removed": {
+    "message": "Token Succesfully Removed",
+    "description": "token removed"
+  },
   "subscription_allowance": {
     "message": "Subscription Allowance",
     "description": "subscription settings title"
@@ -1797,5 +1805,9 @@
   "subscription_delete_error": {
     "message": "Subscription Deletion Error",
     "description": "There was an error deleting the subscription. Please try again."
+  },
+  "subscription_add_failure": {
+    "message": "Failed to add subscription",
+    "description": "Failed to add subscription error message"
   }
 }

src/api/modules/dispatch/allowance.ts

@@ -6,11 +6,14 @@ import type { JWKInterface } from "warp-contracts";
 import { allowanceAuth } from "../sign/allowance";
 import { signAuth } from "../sign/sign_auth";
 import Arweave from "arweave";
+import type { DataItem } from "arbundles";
+import type Transaction from "arweave/web/lib/transaction";
 
 /**
  * Ensure allowance for dispatch
  */
 export async function ensureAllowanceDispatch(
+  dataEntry: DataItem | Transaction,
   appData: ModuleAppData,
   allowance: Allowance,
   keyfile: JWKInterface,

src/api/modules/dispatch/dispatch.background.ts

@@ -90,6 +90,7 @@ const background: ModuleFunction<ReturnType> = async (
     const price = await getPrice(dataEntry, await app.getBundler());
 
     await ensureAllowanceDispatch(
+      dataEntry,
       appData,
       allowance,
       decryptedWallet.keyfile,
@@ -127,6 +128,7 @@ const background: ModuleFunction<ReturnType> = async (
 
     // ensure allowance
     await ensureAllowanceDispatch(
+      transaction,
       appData,
       allowance,
       decryptedWallet.keyfile,

src/api/modules/sign/transaction_builder.ts

@@ -70,6 +70,25 @@ export function deconstructTransaction(transaction: Transaction) {
   };
 }
 
+/**
+ * Get Data size from transaction chunks
+ *
+ * @param chunks Chunks to reconstruct the transaction with
+ *
+ * @returns Data size
+ */
+export function getDataSize(chunks: Chunk[]): number {
+  let dataSize = 0;
+
+  for (const chunk of chunks) {
+    if (chunk.type === "data") {
+      dataSize += chunk.value?.length || 0;
+    }
+  }
+
+  return dataSize;
+}
+
 /**
  * Construct a transaction from a split transaction
  * and it's chunks
@@ -93,9 +112,8 @@ export function constructTransaction(
   chunks.sort((a, b) => a.index - b.index);
 
   // create a Uint8Array to reconstruct the data to
-  const reconstructedData = new Uint8Array(
-    parseFloat(splitTransaction.data_size ?? "0")
-  );
+  const dataSize = getDataSize(chunks);
+  const reconstructedData = new Uint8Array(dataSize);
 
   // previous buffer length in bytes (gets updated
   // in the loop below)

src/api/modules/subscription/subscription.background.ts

@@ -12,7 +12,7 @@ import {
   type SubscriptionData
 } from "~subscriptions/subscription";
 
-const background: ModuleFunction<void> = async (
+const background: ModuleFunction<SubscriptionData> = async (
   appData,
   subscriptionData: SubscriptionData
 ) => {
@@ -22,6 +22,10 @@ const background: ModuleFunction<void> = async (
   isSubscriptionType(subscriptionData);
   const address = await getActiveAddress();
 
+  if (address === subscriptionData.arweaveAccountAddress) {
+    throw new Error("Wallet cannot subscribe to its own address");
+  }
+
   // if is hardware wallet
   const decryptedWallet = await getActiveKeyfile();
   isLocalWallet(decryptedWallet);

src/components/dashboard/Tokens.tsx

@@ -92,7 +92,14 @@ export default function Tokens() {
     setLocation("/tokens/new");
   };
 
-  const handleTokenClick = (token) => {
+  const handleTokenClick = (token: {
+    id: any;
+    defaultLogo?: string;
+    balance?: number;
+    ticker?: string;
+    type?: TokenType;
+    name?: string;
+  }) => {
     setLocation(`/tokens/${token.id}`);
   };
 

src/components/dashboard/list/TokenListItem.tsx

@@ -12,6 +12,7 @@ import styled from "styled-components";
 import { useGateway } from "~gateways/wayfinder";
 import { concatGatewayURL } from "~gateways/utils";
 import aoLogo from "url:/assets/ecosystem/ao-logo.svg";
+import arLogoDark from "url:/assets/ar/logo_dark.png";
 import { getUserAvatar } from "~lib/avatar";
 
 export default function TokenListItem({ token, active, ao, onClick }: Props) {
@@ -43,8 +44,12 @@ export default function TokenListItem({ token, active, ao, onClick }: Props) {
           );
         }
         if (ao) {
-          const logo = await getUserAvatar(token.defaultLogo);
-          return setImage(logo);
+          if (token.defaultLogo) {
+            const logo = await getUserAvatar(token.defaultLogo);
+            return setImage(logo);
+          } else {
+            return setImage(arLogoDark);
+          }
         }
 
         // query community logo using Warp DRE

src/components/hardware/AnimatedQRScanner.tsx

@@ -1,6 +1,6 @@
 import { Loading, Spacer, Text, useToasts } from "@arconnect/components";
 import { AnimatedQRScanner as Scanner } from "@arconnect/keystone-sdk";
-import { type ComponentProps, useEffect, useState } from "react";
+import { type ComponentProps, useEffect, useMemo, useState } from "react";
 import { CameraOffIcon } from "@iconicicons/react";
 import browser from "webextension-polyfill";
 import styled from "styled-components";
@@ -12,6 +12,11 @@ export default function AnimatedQRScanner({ className, ...props }: Props) {
   // camera allowed
   const [cameraAllowed, setCameraAllowed] = useState(true);
 
+  const isWebWorkerAvailable = useMemo(
+    () => typeof Worker !== "undefined",
+    [Worker]
+  );
+
   useEffect(() => {
     (async () => {
       // get if camera permission is granted
@@ -63,9 +68,7 @@ export default function AnimatedQRScanner({ className, ...props }: Props) {
           </>
         )}
       </LoadingSection>
-      <Wrapper>
-        <Scanner {...props} />
-      </Wrapper>
+      <Wrapper>{isWebWorkerAvailable && <Scanner {...props} />}</Wrapper>
     </Outline>
   );
 }

src/components/hardware/KeystoneButton.tsx

@@ -3,7 +3,6 @@ import {
   type KeystoneAccount
 } from "~wallets/hardware/keystone";
 import { addHardwareWallet } from "~wallets/hardware";
-import { usePatchWorker } from "~wallets/hardware/hooks";
 import { useScanner } from "@arconnect/keystone-sdk";
 import {
   Alert,
@@ -83,9 +82,6 @@ export default function KeystoneButton({ onSuccess }: Props) {
     cancel();
   });
 
-  // Patch Worker
-  usePatchWorker();
-
   return (
     <>
       <ButtonV2