Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
de95301
feat: update components and layout for transaction execution
effie-ms Mar 6, 2026
88347c5
feat: outline main page cards
effie-ms Mar 9, 2026
443bc1e
style: transaction details
effie-ms Mar 9, 2026
d4d6fec
feat: replace active transactions with activity center
effie-ms Mar 9, 2026
c78ea0d
refactor: replace SendToWallet components
effie-ms Mar 9, 2026
da5c168
feat: add receipts card
effie-ms Mar 9, 2026
e6c996c
refactor: status circles
effie-ms Mar 10, 2026
08a127b
refactor: transaction history
effie-ms Mar 10, 2026
488ec8a
refactor: component structure
effie-ms Mar 11, 2026
d6cb622
refactor: revert token selectors
effie-ms Mar 11, 2026
cebcd0d
refactor: partially revert amount styling
effie-ms Mar 11, 2026
7c77c15
refactor: replace status bottom sheets
effie-ms Mar 12, 2026
e346c69
refactor: merge status bottom sheet statuses and execution progress
effie-ms Mar 13, 2026
147a93f
feat: store done transactions locally and deduplicate once available …
effie-ms Mar 13, 2026
2f36888
refactor: timer
effie-ms Mar 13, 2026
7569179
refactor: styling
effie-ms Mar 16, 2026
78c77ec
refactor: update component structure and styles for transaction detai…
effie-ms Mar 16, 2026
9801d76
Merge branch 'main' into feat-checkout
effie-ms Mar 18, 2026
238f1c2
refactor: AmountInputHeaderBadge logic and add StepActionsList
effie-ms Mar 18, 2026
a1b8bad
feat: include route essentials into expansion
effie-ms Mar 18, 2026
270f808
feat: add account and remove func to AmountInputHeaderBadge
effie-ms Mar 18, 2026
cf3016c
feat: activities
effie-ms Mar 18, 2026
88a5bc7
fix: amount reset, execution gap
effie-ms Mar 18, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 18 additions & 33 deletions packages/widget/src/AppDefault.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from '@tanstack/react-router'
import { AppLayout } from './AppLayout.js'
import { NotFound } from './components/NotFound.js'
import { ActiveTransactionsPage } from './pages/ActiveTransactionsPage/ActiveTransactionsPage.js'
import { ActivitiesPage } from './pages/ActivitiesPage/ActivitiesPage.js'
import { LanguagesPage } from './pages/LanguagesPage.js'
import { MainPage } from './pages/MainPage/MainPage.js'
import { RoutesPage } from './pages/RoutesPage/RoutesPage.js'
Expand All @@ -22,7 +22,6 @@ import { SendToConfiguredWalletPage } from './pages/SendToWallet/SendToConfigure
import { SendToWalletPage } from './pages/SendToWallet/SendToWalletPage.js'
import { SettingsPage } from './pages/SettingsPage/SettingsPage.js'
import { TransactionDetailsPage } from './pages/TransactionDetailsPage/TransactionDetailsPage.js'
import { TransactionHistoryPage } from './pages/TransactionHistoryPage/TransactionHistoryPage.js'
import { TransactionPage } from './pages/TransactionPage/TransactionPage.js'
import { navigationRoutes } from './utils/navigationRoutes.js'

Expand Down Expand Up @@ -134,23 +133,6 @@ const routesTransactionExecutionDetailsRoute = createRoute({
component: TransactionDetailsPage,
})

const activeTransactionsLayoutRoute = createRoute({
getParentRoute: () => rootRoute,
path: navigationRoutes.activeTransactions,
})

const activeTransactionsIndexRoute = createRoute({
getParentRoute: () => activeTransactionsLayoutRoute,
path: '/',
component: ActiveTransactionsPage,
})

const activeTransactionExecutionRoute = createRoute({
getParentRoute: () => activeTransactionsLayoutRoute,
path: navigationRoutes.transactionExecution,
component: TransactionPage,
})

const sendToWalletLayoutRoute = createRoute({
getParentRoute: () => rootRoute,
path: navigationRoutes.sendToWallet,
Expand Down Expand Up @@ -186,23 +168,29 @@ const configuredWalletsRoute = createRoute({
component: SendToConfiguredWalletPage,
})

const transactionHistoryLayoutRoute = createRoute({
const activitiesLayoutRoute = createRoute({
getParentRoute: () => rootRoute,
path: navigationRoutes.transactionHistory,
path: navigationRoutes.activities,
})

const transactionHistoryIndexRoute = createRoute({
getParentRoute: () => transactionHistoryLayoutRoute,
const activitiesIndexRoute = createRoute({
getParentRoute: () => activitiesLayoutRoute,
path: '/',
component: TransactionHistoryPage,
component: ActivitiesPage,
})

const transactionHistoryDetailsRoute = createRoute({
getParentRoute: () => transactionHistoryLayoutRoute,
const activitiesDetailsRoute = createRoute({
getParentRoute: () => activitiesLayoutRoute,
path: navigationRoutes.transactionDetails,
component: TransactionDetailsPage,
})

const activitiesExecutionRoute = createRoute({
getParentRoute: () => activitiesLayoutRoute,
path: navigationRoutes.transactionExecution,
component: TransactionPage,
})

const transactionExecutionLayoutRoute = createRoute({
getParentRoute: () => rootRoute,
path: navigationRoutes.transactionExecution,
Expand Down Expand Up @@ -245,20 +233,17 @@ const routeTree = rootRoute.addChildren([
transactionExecutionIndexRoute,
transactionExecutionDetailsRoute,
]),
activeTransactionsLayoutRoute.addChildren([
activeTransactionsIndexRoute,
activeTransactionExecutionRoute,
]),
sendToWalletLayoutRoute.addChildren([
sendToWalletIndexRoute,
sendToWalletBookmarksRoute,
sendToWalletRecentWalletsRoute,
sendToWalletConnectedWalletsRoute,
]),
configuredWalletsRoute,
transactionHistoryLayoutRoute.addChildren([
transactionHistoryIndexRoute,
transactionHistoryDetailsRoute,
activitiesLayoutRoute.addChildren([
activitiesIndexRoute,
activitiesDetailsRoute,
activitiesExecutionRoute,
]),
])

Expand Down
27 changes: 27 additions & 0 deletions packages/widget/src/components/ActionRow/ActionRow.style.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { Box, styled, Typography } from '@mui/material'

export const ActionRowContainer = styled(Box)(({ theme }) => ({
display: 'flex',
alignItems: 'center',
gap: theme.spacing(1),
padding: theme.spacing(1),
borderRadius: theme.vars.shape.borderRadiusTertiary,
backgroundColor: `rgba(${theme.vars.palette.common.onBackgroundChannel} / 0.04)`,
}))

export const ActionIconCircle = styled(Box)(({ theme }) => ({
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
width: 24,
height: 24,
borderRadius: '50%',
backgroundColor: `color-mix(in srgb, rgb(${theme.vars.palette.success.mainChannel}) 12%, ${theme.vars.palette.background.paper})`,
}))

export const ActionRowLabel = styled(Typography)(({ theme }) => ({
flex: 1,
fontSize: 12,
fontWeight: 500,
color: theme.vars.palette.text.primary,
}))
22 changes: 22 additions & 0 deletions packages/widget/src/components/ActionRow/ActionRow.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import type { FC, ReactNode } from 'react'
import { ActionRowContainer, ActionRowLabel } from './ActionRow.style.js'

interface ActionRowProps {
message: string
startAdornment: ReactNode
endAdornment?: ReactNode
}

export const ActionRow: FC<ActionRowProps> = ({
message,
startAdornment,
endAdornment,
}) => {
return (
<ActionRowContainer>
{startAdornment}
<ActionRowLabel>{message}</ActionRowLabel>
{endAdornment}
</ActionRowContainer>
)
}

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ export const Input = styled(InputBase)(({ theme }) => ({
}))

export const AmountInputCardTitle = styled(CardTitle)(({ theme }) => ({
padding: theme.spacing(2, 0, 0, 0),
padding: theme.spacing(0),
}))

export const AmountInputCardHeader = styled(Box)(({ theme }) => ({
padding: theme.spacing(0, 2, 0, 2),
margin: theme.spacing(2, 2, 0, 2),
display: 'flex',
justifyContent: 'space-between',
alignItems: 'start',
height: 30,
alignItems: 'center',
height: 28,
}))
Loading
Loading