Merge pull request #1727 from blockscout/fe-1726

fix react keys for withdrawals
blockscout · Mar 19, 2024 · 567aa1b · 567aa1b
2 parents 3699cb4 + b123e5a
commit 567aa1b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/configs/envs/.env.optimism_goerli b/configs/envs/.env.optimism_goerli
@@ -43,6 +43,6 @@ NEXT_PUBLIC_VISUALIZE_API_HOST=https://visualizer.services.blockscout.com
 NEXT_PUBLIC_CONTRACT_INFO_API_HOST=https://contracts-info.services.blockscout.com
 NEXT_PUBLIC_ADMIN_SERVICE_API_HOST=https://admin-rs.services.blockscout.com
 # rollup
-NEXT_PUBLIC_IS_OPTIMISTIC_L2_NETWORK=true
-NEXT_PUBLIC_OPTIMISTIC_L2_WITHDRAWAL_URL=https://app.optimism.io/bridge/withdraw
-NEXT_PUBLIC_L1_BASE_URL=https://eth-goerli.blockscout.com/
+NEXT_PUBLIC_ROLLUP_TYPE='optimistic'
+NEXT_PUBLIC_ROLLUP_L2_WITHDRAWAL_URL=https://app.optimism.io/bridge/withdraw
+NEXT_PUBLIC_ROLLUP_L1_BASE_URL=https://eth-goerli.blockscout.com/
diff --git a/public/icons/name.d.ts b/public/icons/name.d.ts
@@ -18,6 +18,7 @@
 	| "block_slim"
 	| "block"
 	| "brands/safe"
+	| "brands/solidity_scan"
 	| "burger"
 	| "check"
 	| "clock-light"
@@ -113,7 +114,6 @@
 	| "social/telegram_filled"
 	| "social/tweet"
 	| "social/twitter_filled"
-	| "solidity_scan"
 	| "star_filled"
 	| "star_outline"
 	| "stats"

diff --git a/ui/pages/OptimisticL2Withdrawals.tsx b/ui/pages/OptimisticL2Withdrawals.tsx
@@ -39,7 +39,7 @@ const OptimisticL2Withdrawals = () => {
     <>
       <Show below="lg" ssr={ false }>{ data.items.map(((item, index) => (
         <OptimisticL2WithdrawalsListItem
-          key={ item.l2_tx_hash + (isPlaceholderData ? index : '') }
+          key={ String(item.msg_nonce_version) + item.msg_nonce + (isPlaceholderData ? index : '') }
           item={ item }
           isLoading={ isPlaceholderData }
         />

diff --git a/ui/withdrawals/optimisticL2/OptimisticL2WithdrawalsTable.tsx b/ui/withdrawals/optimisticL2/OptimisticL2WithdrawalsTable.tsx
@@ -29,7 +29,11 @@ const OptimisticL2WithdrawalsTable = ({ items, top, isLoading }: Props) => {
       </Thead>
       <Tbody>
         { items.map((item, index) => (
-          <OptimisticL2WithdrawalsTableItem key={ item.l2_tx_hash + (isLoading ? index : '') } item={ item } isLoading={ isLoading }/>
+          <OptimisticL2WithdrawalsTableItem
+            key={ String(item.msg_nonce_version) + item.msg_nonce + (isLoading ? index : '') }
+            item={ item }
+            isLoading={ isLoading }
+          />
         )) }
       </Tbody>
     </Table>