diff --git a/packages/bridge/src/components/Transfer/index.tsx b/packages/bridge/src/components/Transfer/index.tsx
index 224b84f..a34de11 100644
--- a/packages/bridge/src/components/Transfer/index.tsx
+++ b/packages/bridge/src/components/Transfer/index.tsx
@@ -78,9 +78,11 @@ export const Transfer = () => {
     });
   }, [A, B, mintAddress]);
 
+  const from = A.chain;
+
   useEffect(() => {
     const asset = request.asset;
-    if (!asset || asset === request?.info?.address) {
+    if (!asset || (asset === request?.info?.address && request.from === from)) {
       return;
     }
 
@@ -89,9 +91,9 @@ export const Transfer = () => {
         return;
       }
       try {
+        const bridgeAddress = programIds().wormhole.bridge;
 
         if(request.from === ASSET_CHAIN.Solana) {
-          const bridgeAddress = programIds().wormhole.bridge;
 
           let signer = provider.getSigner();
           let e = WrappedAssetFactory.connect(asset, provider);
@@ -132,23 +134,29 @@ export const Transfer = () => {
 
           setRequest({
             ...request,
+            from,
             asset,
             info,
           });
         } else {
-          console.log(asset);
+          console.log('Asset: ', asset);
+          debugger;
+
+          // get user address from asset
+          //
+
           // let info = {
           //   address: fromAddress,
-          //     name: "",
-          //     balance: acc.balance,
-          //     allowance: 0,
-          //     decimals: acc.assetMeta.decimals,
-          //     isWrapped: acc.assetMeta.chain != ChainID.SOLANA,
-          //     chainID: acc.assetMeta.chain,
-          //     assetAddress: acc.assetMeta.address,
+          //   name: "",
+          //   balance: acc.balance,
+          //   allowance: 0,
+          //   decimals: acc.assetMeta.decimals,
+          //   isWrapped: acc.assetMeta.chain != ChainID.SOLANA,
+          //   chainID: acc.assetMeta.chain,
+          //   assetAddress: acc.assetMeta.address,
 
-          //     // Solana specific
-          //     mint: acc.mint,
+          //   // Solana specific
+          //   mint: acc.mint,
           // };
         }
       } catch (e) {
@@ -160,7 +168,7 @@ export const Transfer = () => {
         });
       }
     })();
-  }, [request, provider]);
+  }, [request, from, provider]);
 
   return (
     <>
diff --git a/packages/bridge/src/views/home/index.tsx b/packages/bridge/src/views/home/index.tsx
index 779a3a2..e1504a0 100644
--- a/packages/bridge/src/views/home/index.tsx
+++ b/packages/bridge/src/views/home/index.tsx
@@ -81,7 +81,7 @@ export const HomeView = () => {
             style: {},
           },
           children: (
-            <a href={record.explorer} target="_blank">
+            <a href={record.explorer} target="_blank" rel="noopener noreferrer" >
               {shortenAddress(text, 6)}
             </a>
           ),
@@ -98,7 +98,7 @@ export const HomeView = () => {
             style: {},
           },
           children: (
-            <a href={record.wrappedExplorer} target="_blank">
+            <a href={record.wrappedExplorer} target="_blank" rel="noopener noreferrer" >
               {shortenAddress(text, 6)}
             </a>
           ),