diff --git a/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.module.css b/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.module.css index 873cbb69..b7ed7d30 100644 --- a/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.module.css +++ b/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.module.css @@ -260,10 +260,6 @@ /* 150% */ } -.manualGasMessageTooltip { - background: #B54708; -} - @media (max-width: 1199px) { .container { width: 100%; @@ -285,4 +281,13 @@ .arrowIcon { display: none; } +} + +.customTooltip { + max-width: 200px; + padding: 10px; + border-radius: 8px; + white-space: normal; + overflow: hidden; + text-align: center; } \ No newline at end of file diff --git a/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.tsx b/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.tsx index 9ebc1ad1..a14c4610 100644 --- a/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.tsx +++ b/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.tsx @@ -178,9 +178,6 @@ const BridgeView = ({ return (
-
-
Move assets between different blockchains
-
} = ({
You will receive
-
{`${value} ${tokenSymbol}`}
+
+ {`${value} ${tokenSymbol.startsWith('USDC') ? (tokenSymbol === 'USDC.e' ? 'USDC' : 'USDC.e') : tokenSymbol}`} +
{tokenRate > 0 &&
{formatCurrency(value * (tokenSymbol === 'ETH' || tokenSymbol === 'G7' || tokenSymbol === 'TG7T' ? ethRate : tokenRate))}
}
diff --git a/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx b/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx index 7f83c067..97c96ecb 100644 --- a/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx +++ b/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx @@ -78,7 +78,7 @@ const HistoryDesktop: React.FC = () => { const localTransactions = messages || [] const formattedApiTransactions = apiTransactions ? apiTransactions.map(apiDataToTransactionRecord) : [] const combinedTransactions = mergeTransactions(formattedApiTransactions, localTransactions) - + console.log(formattedApiTransactions) // Check if the combined transactions are different from those in localStorage if ( combinedTransactions.length !== localTransactions.length || diff --git a/webapps/world-builder-dashboard/src/components/notifications/NotificationsDropModal.tsx b/webapps/world-builder-dashboard/src/components/notifications/NotificationsDropModal.tsx index f9bf2d36..cfb9b31c 100644 --- a/webapps/world-builder-dashboard/src/components/notifications/NotificationsDropModal.tsx +++ b/webapps/world-builder-dashboard/src/components/notifications/NotificationsDropModal.tsx @@ -25,7 +25,7 @@ interface NotificationsDropModalProps { const copy = (notification: BridgeNotification, selectedNetworkType: NetworkType) => { const targetNetwork = getNetwork(notification.to, selectedNetworkType)?.displayName ?? 'unknown chain' if (notification.status === 'CLAIMABLE') { - return `Heads Up: Your ${notification.amount} ${notification.tx.transactionInputs?.tokenSymbol ? notification.tx.transactionInputs?.tokenSymbol : ''} withdrawal is complete and you can now claim your assets` + return `Your ${notification.amount} ${notification.tx.transactionInputs?.tokenSymbol ? notification.tx.transactionInputs?.tokenSymbol : ''} withdrawal is ready to complete. Claim your token in Activity.` } if (notification.status === 'COMPLETED') { if (notification.type === 'DEPOSIT') {