resolve conflicts

.release-please-manifest.json

@@ -1,7 +1,7 @@
 {
   "packages/branding": "0.4.0",
   "packages/bridge-ui": "2.11.0",
-  "packages/docs-site": "1.11.2",
+  "packages/docs-site": "1.11.3",
   "packages/eventindexer": "0.13.0",
   "packages/fork-diff": "0.6.0",
   "packages/guardian-prover-health-check": "0.1.0",

packages/bridge-ui/src/components/Bridge/FungibleBridgeComponents/ImportStep/ImportStep.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount } from 'svelte';
 
-  import { importDone, processingFeeMethod, recipientAddress } from '$components/Bridge/state';
+  import { destOwnerAddress, importDone, processingFeeMethod, recipientAddress } from '$components/Bridge/state';
   import { ChainSelector, ChainSelectorType } from '$components/ChainSelectors';
   import { ProcessingFeeMethod } from '$libs/fee';
 
@@ -14,6 +14,7 @@
 
   const reset = () => {
     $recipientAddress = null;
+    $destOwnerAddress = null;
     $processingFeeMethod = ProcessingFeeMethod.RECOMMENDED;
   };
 

packages/bridge-ui/src/components/Bridge/FungibleBridgeComponents/ImportStep/TokenInput/TokenInput.svelte

@@ -34,7 +34,6 @@
   import { debounce } from '$libs/util/debounce';
   import { getLogger } from '$libs/util/logger';
   import { truncateDecimal } from '$libs/util/truncateDecimal';
-  import { uid } from '$libs/util/uid';
   import { account } from '$stores/account';
   import { ethBalance } from '$stores/balance';
   import { connectedSourceChain } from '$stores/network';
@@ -46,7 +45,7 @@
   export let hasEnoughEth: boolean = false;
   export let exceedsQuota: boolean = false;
 
-  let inputId = `input-${uid()}`;
+  let inputId = `input-${crypto.randomUUID()}`;
   let inputBox: InputBox;
 
   let value = '';

packages/bridge-ui/src/components/Bridge/FungibleBridgeComponents/ReviewStep/ReviewStep.svelte

@@ -6,11 +6,19 @@
   import { chainConfig } from '$chainConfig';
   import { Alert } from '$components/Alert';
   import { ProcessingFee, Recipient } from '$components/Bridge/SharedBridgeComponents';
-  import { destNetwork as destChain, enteredAmount, processingFee, selectedToken } from '$components/Bridge/state';
+  import DestOwner from '$components/Bridge/SharedBridgeComponents/RecipientStep/DestOwner.svelte';
+  import {
+    destNetwork as destChain,
+    destOwnerAddress,
+    enteredAmount,
+    processingFee,
+    selectedToken,
+  } from '$components/Bridge/state';
   import { PUBLIC_SLOW_L1_BRIDGING_WARNING } from '$env/static/public';
   import { LayerType } from '$libs/chain';
-  import { isStablecoin, isSupported, isWrapped, type Token, TokenType } from '$libs/token';
+  import { isWrapped, type Token, TokenType } from '$libs/token';
   import { isToken } from '$libs/token/isToken';
+  import { account } from '$stores/account';
   import { ethBalance } from '$stores/balance';
   import { connectedSourceChain } from '$stores/network';
 
@@ -19,6 +27,7 @@
   export let hasEnoughFundsToContinue: boolean = true;
 
   let recipientComponent: Recipient;
+  let destOwnerComponent: DestOwner;
   let processingFeeComponent: ProcessingFee;
   let slowL1Warning = PUBLIC_SLOW_L1_BRIDGING_WARNING || false;
 
@@ -27,14 +36,12 @@
 
   $: wrapped = $selectedToken !== null && isWrapped($selectedToken as Token);
 
-  $: unsupportedStableCoin =
-    $selectedToken !== null && !isSupported($selectedToken as Token) && isStablecoin($selectedToken as Token);
+  // $: unsupportedStableCoin =
+  //   $selectedToken !== null && !isSupported($selectedToken as Token) && isStablecoin($selectedToken as Token);
 
   $: wrappedAssetWarning = $t('bridge.alerts.wrapped_eth');
 
-  $: stableCoinWarning = $t('bridge.alerts.stable_coin');
-
-  $: if (wrapped || unsupportedStableCoin) {
+  $: if (wrapped) {
     needsManualReviewConfirmation = true;
   } else {
     needsManualReviewConfirmation = false;
@@ -106,6 +113,9 @@ Recipient & Processing Fee
     <button class="flex justify-start link" on:click={editTransactionDetails}> {$t('common.edit')} </button>
   </div>
   <Recipient bind:this={recipientComponent} small />
+  {#if $destOwnerAddress !== $account?.address && $destOwnerAddress}
+    <DestOwner bind:this={destOwnerComponent} small />
+  {/if}
   <ProcessingFee bind:this={processingFeeComponent} small bind:hasEnoughEth />
 </div>
 
@@ -117,8 +127,3 @@ Recipient & Processing Fee
   <!-- eslint-disable-next-line svelte/no-at-html-tags -->
   <Alert type="warning">{@html wrappedAssetWarning}</Alert>
 {/if}
-
-{#if unsupportedStableCoin}
-  <!-- eslint-disable-next-line svelte/no-at-html-tags -->
-  <Alert type="warning">{@html stableCoinWarning}</Alert>
-{/if}

packages/bridge-ui/src/components/Bridge/NFTBridge.svelte

@@ -22,6 +22,7 @@
   import {
     activeBridge,
     destNetwork as destinationChain,
+    destOwnerAddress,
     importDone,
     recipientAddress,
     selectedNFTs,
@@ -101,6 +102,7 @@
     if (nftIdInputComponent) nftIdInputComponent.clearIds();
 
     $recipientAddress = $account?.address || null;
+    $destOwnerAddress = $account?.address || null;
     bridgingStatus = BridgingStatus.PENDING;
     $selectedToken = ETHToken;
     importMethod === null;

packages/bridge-ui/src/components/Bridge/NFTBridgeComponents/IDInput/IDInput.svelte

@@ -4,7 +4,6 @@
 
   import { Icon } from '$components/Icon';
   import InputBox from '$components/InputBox/InputBox.svelte';
-  import { uid } from '$libs/util/uid';
 
   import { IDInputState as State } from './state';
 
@@ -24,7 +23,7 @@
 
   const dispatch = createEventDispatcher();
 
-  let inputId = `input-${uid()}`;
+  let inputId = `input-${crypto.randomUUID()}`;
 
   function validateInput(idInput: EventTarget | number[] | null = null) {
     state = State.VALIDATING;

packages/bridge-ui/src/components/Bridge/NFTBridgeComponents/ImportStep/TokenAmountInput.svelte

@@ -10,7 +10,6 @@
   import { ETHToken, fetchBalance, fetchBalance as getTokenBalance, TokenType } from '$libs/token';
   import { debounce } from '$libs/util/debounce';
   import { getLogger } from '$libs/util/logger';
-  import { uid } from '$libs/util/uid';
   import { account } from '$stores/account';
   import { ethBalance } from '$stores/balance';
   import { connectedSourceChain } from '$stores/network';
@@ -30,7 +29,7 @@
 
   const log = getLogger('component:Amount');
 
-  let inputId = `input-${uid()}`;
+  let inputId = `input-${crypto.randomUUID()}`;
   let inputBox: InputBox;
   let computingMaxAmount = false;
   let invalidInput = false;

packages/bridge-ui/src/components/Bridge/SharedBridgeComponents/AddressInput/AddressInput.svelte

@@ -8,12 +8,12 @@
   import { Icon } from '$components/Icon';
   import { withHoverAndFocusListener } from '$libs/customActions';
   import { classNames } from '$libs/util/classNames';
-  import { uid } from '$libs/util/uid';
+  import { account } from '$stores/account';
 
   import { AddressInputState as State } from './state';
 
   let inputElement: HTMLInputElement;
-  let inputId = `input-${uid()}`;
+  let inputId = `input-${crypto.randomUUID()}`;
   let isElementFocused = false;
   let isElementHovered = false;
 
@@ -26,6 +26,7 @@
   export let isDisabled = false;
   export let quiet = false;
   export let state: State = State.DEFAULT;
+  export let resettable = false;
 
   export let onDialog = false;
 
@@ -54,6 +55,12 @@
     state = State.DEFAULT;
   };
 
+  const setToCurrentAddress = (): void => {
+    clearAddress();
+    ethereumAddress = $account?.address || '';
+    validateAddress();
+  };
+
   export const focus = (): void => inputElement.focus();
 
   $: defaultBorder = (() => {
@@ -78,6 +85,9 @@
   <!-- Input field and label -->
   <div class="f-between-center text-secondary-content">
     <label class="body-regular" for={inputId}>{labelText}</label>
+    {#if resettable}
+      <button class="link" on:click={setToCurrentAddress}>{$t('common.reset_to_wallet')}</button>
+    {/if}
   </div>
   <div class="relative f-items-center">
     <input

packages/bridge-ui/src/components/Bridge/SharedBridgeComponents/ProcessingFee/ProcessingFee.svelte

@@ -13,7 +13,6 @@
   import { closeOnEscapeOrOutsideClick } from '$libs/customActions';
   import { ProcessingFeeMethod } from '$libs/fee';
   import { parseToWei } from '$libs/util/parseToWei';
-  import { uid } from '$libs/util/uid';
 
   import NoneOption from './NoneOption.svelte';
   import RecommendedFee from './RecommendedFee.svelte';
@@ -23,7 +22,7 @@
   export let hasEnoughEth: boolean = false;
   export let disabled = false;
 
-  let dialogId = `dialog-${uid()}`;
+  let dialogId = `dialog-${crypto.randomUUID()}`;
 
   let recommendedAmount = BigInt(0);
   let errorCalculatingRecommendedAmount = false;