Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Wallet tx simple view #1787

Draft
wants to merge 88 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
109794e
feat: grouped wallet view WIP
nelitow Jan 20, 2025
5c95579
feat: separate into components
nelitow Jan 20, 2025
bf478f6
fix(ecosystem): enhance error handling in fetchProjects method
nelitow Jan 20, 2025
2975d8a
feat(Transaction): add totalAmount and operationCount to ContractCall…
nelitow Jan 20, 2025
a8f965d
refactor(TxViewSimpleWrapper): remove console logs and simplify loadi…
nelitow Jan 20, 2025
535df29
refactor(TxFeeSimple): streamline fee display logic and enhance asset…
nelitow Jan 20, 2025
2017132
refactor(TxOperationCard): remove console logs and simplify group det…
nelitow Jan 20, 2025
6a06bdf
refactor(TxOperationContent): remove console logs to clean up code
nelitow Jan 20, 2025
3deb369
feat(TxOperationHeader): enhance contract call display with project info
nelitow Jan 20, 2025
9ddd6cf
feat(TxOperationSend): enhance transaction display with asset amounts…
nelitow Jan 20, 2025
602c0cc
feat(TxOperationSwap): enhance swap operation display with ecosystem …
nelitow Jan 20, 2025
c28a430
feat(useEcosystemProject): implement custom hook for fetching and cac…
nelitow Jan 20, 2025
a23a780
refactor(simplifyTransaction): improve grouping logic for transaction…
nelitow Jan 20, 2025
e8af0e8
Merge branch 'master' into nj/feat/tx-simple-view
nelitow Jan 20, 2025
05aa994
refactor(TxFeeSimple): simplify component structure by removing Card …
nelitow Jan 21, 2025
f3009c6
feat(TxOperationSend): enhance transaction display by adding account …
nelitow Jan 21, 2025
b3492e3
refactor(TxOperationSwap): remove redundant address display and copy …
nelitow Jan 21, 2025
0084c32
feat: break into smaller components
nelitow Jan 22, 2025
686a4bc
feat: new component structure and simplification of code
nelitow Jan 22, 2025
f92e013
stlyes: reduce ui gaps
nelitow Jan 22, 2025
3a769cd
feat(Transaction): enhance transaction types and operations with dept…
nelitow Jan 23, 2025
1f48afc
feat: group indent by depth
nelitow Jan 23, 2025
36cf37e
delete unused components
nelitow Jan 23, 2025
22f33d5
simplify
nelitow Jan 23, 2025
9b9d6fb
styles: begin figma work
nelitow Jan 24, 2025
0c3cbc0
style: make it a grid
nelitow Jan 24, 2025
52485a3
feat: show assets properly
nelitow Jan 25, 2025
f096552
style: create custom AssetAmount
nelitow Jan 26, 2025
f15a986
styles: simple fee
nelitow Jan 27, 2025
0214c00
feat: add custom fee options to simplified transaction view
nelitow Jan 27, 2025
3728151
style: update TxOperationsGroup with new design and interaction
nelitow Jan 27, 2025
e0bf7e0
style: ui
nelitow Jan 27, 2025
e543160
style: adjust tx header
nelitow Jan 27, 2025
36aa2c6
style: animate groups
nelitow Jan 27, 2025
cf68b40
styles: fee title
nelitow Jan 28, 2025
cf05d80
style: avatar
nelitow Jan 28, 2025
4c80287
style: refine TxOperationsGroup layout and styling
nelitow Jan 29, 2025
89ead3f
feat: improve TxOperationsGroup animation and layout
nelitow Jan 29, 2025
935a38c
refactor: simplify TxOperation component and asset rendering
nelitow Jan 29, 2025
e042190
style: enhance transaction operations list and component styling
nelitow Jan 29, 2025
5d620d4
style: refine TxOperationsGroup styling and layout details
nelitow Jan 29, 2025
998bf74
feat: pass current account to transaction operations list
nelitow Jan 29, 2025
ed39925
chore: update fuels dependency to local development version
nelitow Jan 29, 2025
32d5989
fix: types
nelitow Jan 29, 2025
31d2981
style: update TxFeeOptionsSimple color scheme
nelitow Jan 30, 2025
45b6294
style: enhance TxFeeSimple component with refined styling and formatting
nelitow Jan 30, 2025
59ede22
style: update TxViewSimple component color tokens
nelitow Jan 30, 2025
d82ef93
style: update TxOperationsGroup color tokens and styling
nelitow Jan 30, 2025
02bb118
refactor: remove unused transaction display components
nelitow Jan 30, 2025
9ffd5d1
style: improve TxOperation asset rendering and color tokens
nelitow Jan 30, 2025
019202c
refactor: simplify TxHeaderSimple component and remove unused props
nelitow Jan 30, 2025
78697f2
style: improve TxFeeOptionsSimple input styling and focus states
nelitow Jan 30, 2025
79a992c
feat: add categorized operations to transaction view
nelitow Jan 30, 2025
3713e55
feat: improve contract operation type detection
nelitow Jan 30, 2025
875d2c5
feat: add SimplifiedAddress type for enhanced transaction address han…
nelitow Jan 31, 2025
298f540
refactor: improve transaction operation depth calculation and receipt…
nelitow Jan 31, 2025
65a605f
base goruping
nelitow Jan 31, 2025
3f5173b
Separate operation card.
nelitow Jan 31, 2025
8075534
feat: enhance transaction operation grouping with child operations
nelitow Jan 31, 2025
15a8061
feat: add animations to transaction operation expansion
nelitow Jan 31, 2025
1638a42
feat: add depth-based indentation to transaction operation card
nelitow Jan 31, 2025
ed4cfcf
style: simplify transaction warning text
nelitow Feb 3, 2025
0b54eac
refactor: simplify TxOperationsList component layout and styling
nelitow Feb 3, 2025
e1a402d
style: update TxOperationCard styling with refined shadow and layout
nelitow Feb 3, 2025
d9b0b00
style: refine TxOperationCard visual styling and shadows
nelitow Feb 3, 2025
11fa6ff
feat: pass depth to TxOperationCard and refine nested operations layout
nelitow Feb 3, 2025
dbb911a
base: use tx simple in transactions list
nelitow Feb 3, 2025
fd0aa44
feat: add variant support for transaction view components
nelitow Feb 3, 2025
5aec855
refactor: update TxApprove page to use TxViewSimpleWrapper
nelitow Feb 3, 2025
ae529ac
Merge branch 'master' into nj/feat/tx-simple-view
nelitow Feb 3, 2025
6ef04ac
diff: clean
nelitow Feb 3, 2025
3035206
chore: remove redundant wrapper
nelitow Feb 3, 2025
7074ba7
rename TxViewSimple
nelitow Feb 3, 2025
35ef8bb
feat: add TxFeeOptions component for custom transaction fees
nelitow Feb 3, 2025
cfadb5c
merge: txfee
nelitow Feb 3, 2025
d49bdd5
merge: fee options
nelitow Feb 3, 2025
c29c741
fix: update import path for OperationDirection type
nelitow Feb 3, 2025
955a90e
refactor: consolidate transaction operations components
nelitow Feb 3, 2025
ca44762
fix: simplify transaction request loading state handling
nelitow Feb 3, 2025
f969d51
refactor: rename transaction props for clarity and consistency
nelitow Feb 3, 2025
1a6c5ec
refactor: remove TxContent component and related files
nelitow Feb 3, 2025
ef904dd
style: clean input styles to match current theme more
nelitow Feb 3, 2025
24a7671
refactor: consolidate and simplify transaction details components
nelitow Feb 4, 2025
1a1ad7e
refactor: remove transaction view variant and simplify TxDetails props
nelitow Feb 4, 2025
ef8b3ab
Merge branch 'master' into nj/feat/tx-simple-view
nelitow Feb 4, 2025
2073308
fix: correctly display total transaction fee
nelitow Feb 4, 2025
30033aa
feat: improve transaction fee selection with radio group
nelitow Feb 4, 2025
e8f20a0
style: adjust transaction operation and group layout spacing
nelitow Feb 4, 2025
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
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@
"typescript.suggest.paths": true,
"typescript.suggest.enabled": true,
"typescript.suggest.completeFunctionCalls": true,
"[typescriptreact]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useMemo } from 'react';
import { useAssets } from '~/systems/Asset';
import { Layout } from '~/systems/Core';
import { TopBarType } from '~/systems/Core/components/Layout/TopBar';
import { TxContent, getGasLimitFromTxRequest } from '~/systems/Transaction';
import { TxDetails, getGasLimitFromTxRequest } from '~/systems/Transaction';
import { formatTip } from '~/systems/Transaction/components/TxFeeOptions/TxFeeOptions.utils';
import { useTransactionRequest } from '../../hooks/useTransactionRequest';
import { AutoSubmit } from './TransactionRequest.AutoSubmit';
Expand All @@ -29,7 +29,6 @@ export function TransactionRequest() {
shouldShowActions,
shouldDisableApproveBtn,
errors,
executedStatus,
proposedTxRequest,
} = txRequest;
const { isLoading: isLoadingAssets } = useAssets();
Expand Down Expand Up @@ -58,17 +57,6 @@ export function TransactionRequest() {
return status('loading') || status('sending') || isLoadingAssets;
}, [status, isLoadingAssets]);

if (!defaultValues) {
return (
<Layout title={title} noBorder>
<Layout.TopBar type={TopBarType.external} />
<Layout.Content css={styles.content}>
<TxContent.Loader />
</Layout.Content>
</Layout>
);
}

return (
<FormProvider
onSubmit={handlers.approve}
Expand All @@ -85,21 +73,20 @@ export function TransactionRequest() {
<Layout.TopBar type={TopBarType.external} />
<Layout.Content css={styles.content}>
{shouldShowTxSimulated && (
<TxContent.Info
<TxDetails
showDetails
tx={txSummarySimulated}
txRequest={proposedTxRequest}
isLoading={isLoadingInfo}
isLoading={isLoadingInfo || !defaultValues}
errors={errors.simulateTxErrors}
isConfirm
fees={fees}
/>
)}
{shouldShowTxExecuted && (
<TxContent.Info
showDetails
<TxDetails
tx={txSummaryExecuted}
txStatus={executedStatus()}
showDetails
footer={
status('failed') && (
<Button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const styles = {

'.fuel_Dialog-description': {
flex: 1,
overflowY: 'auto',
overflowY: 'auto !important',
height: '100%',
},
'.fuel_Dialog-heading': {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading