diff --git a/packages/bridge-ui-v2/src/components/Activities/Status.svelte b/packages/bridge-ui-v2/src/components/Activities/Status.svelte
index 33cb670c1f..4ad1567dbb 100644
--- a/packages/bridge-ui-v2/src/components/Activities/Status.svelte
+++ b/packages/bridge-ui-v2/src/components/Activities/Status.svelte
@@ -114,6 +114,7 @@
 
       await pendingTransactions.add(txHash, Number(bridgeTx.destChainId));
 
+      //Todo: just because we have a claim tx doesn't mean it was successful
       successToast(
         $t('activities.actions.claim.success', {
           values: {
diff --git a/packages/bridge-ui-v2/src/components/Button/Button.svelte b/packages/bridge-ui-v2/src/components/Button/Button.svelte
index 5034bcc50b..7e65d4adca 100644
--- a/packages/bridge-ui-v2/src/components/Button/Button.svelte
+++ b/packages/bridge-ui-v2/src/components/Button/Button.svelte
@@ -21,7 +21,6 @@
   export let outline = false;
   export let block = false;
   export let wide = false;
-  export let disabled = false;
 
   export let hasBorder = false;
 
@@ -71,7 +70,7 @@
     // since we're showing some important information.
     loading ? 'btn-disabled !text-primary-content' : null,
 
-    disabled ? borderClasses : '',
+    $$restProps.disabled ? borderClasses : '',
 
     $$props.class,
   );
@@ -82,7 +81,7 @@
   }
 </script>
 
-<button {...$$restProps} {disabled} class={classes} on:click>
+<button {...$$restProps} class={classes} on:click>
   {#if loading}
     <Spinner />
   {/if}