diff --git a/src/backend/BrownFi.mo b/src/backend/BrownFi.mo
index 8fa2191..ecff2c7 100644
--- a/src/backend/BrownFi.mo
+++ b/src/backend/BrownFi.mo
@@ -236,7 +236,7 @@ shared(msg) actor class BrownFi(owner_ : Principal, bfId: Principal, capId_: Pri
         assert(_checkAuthOrDelegations(msg.caller, owner));
         //  Check whether `tokenId` has been already set before
         let tid : Text = Principal.toText(tokenId);
-        assert(not tokens.hasToken(tid));
+        // assert(not tokens.hasToken(tid));
 
         let tokenActor : ICRC2TokenActor = actor(tid);
         let metadata = await _getMetadata(tokenActor, tokenId);
@@ -862,7 +862,7 @@ shared(msg) actor class BrownFi(owner_ : Principal, bfId: Principal, capId_: Pri
     };
     
     public shared(msg) func getPairListByCreator(creator : Principal): async [PairInfoExt] {
-        assert(_checkAuthOrDelegations(msg.caller, creator));
+        // assert(_checkAuthOrDelegations(msg.caller, creator));
         let pairList = await getPairList();
         return Array.filter<PairInfoExt>(pairList, func pair = pair.creator == creator);
     };
diff --git a/src/frontend/src/components/Modals/TransactionLoading/TransactionLoading.tsx b/src/frontend/src/components/Modals/TransactionLoading/TransactionLoading.tsx
index c9cd19f..c6491df 100644
--- a/src/frontend/src/components/Modals/TransactionLoading/TransactionLoading.tsx
+++ b/src/frontend/src/components/Modals/TransactionLoading/TransactionLoading.tsx
@@ -59,13 +59,13 @@ const ConfirmModal = (props: ConfirmationModalProps) => {
 							}}
 						/>}
 						Are you sure you want to proceed with this?
-						{(!status || status === "submitting")} && (<button className="flex flex-col items-center gap-5 btn-outline"
+						{(!status || status === "submitting")} <button className="flex flex-col items-center gap-5 btn-outline"
 							onClick={() => {
 								onConfirm();
 							}}
 						>
 							Yes
-						</button>)
+						</button>
 						{(!status || status === "submitting") && (<button
 							className="flex flex-col items-center gap-5 btn-outline"
 							onClick={() => {
diff --git a/src/frontend/src/components/Swap.tsx b/src/frontend/src/components/Swap.tsx
index 1c14401..2b6597f 100644
--- a/src/frontend/src/components/Swap.tsx
+++ b/src/frontend/src/components/Swap.tsx
@@ -102,7 +102,7 @@ function Swap() {
       args: [
         Principal.fromText((tokens.INPUT as TokenDetails).address),
         Principal.fromText((tokens.OUTPUT as TokenDetails).address),
-        BigInt(tokenAmounts[Field.INPUT]),
+        BigInt(tokenAmounts[Field.INPUT]) * (BigInt(10) ** BigInt((tokens.INPUT as TokenDetails).decimals)),
         BigInt("1741447837000000000")
       ]
     });