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.

Sign up for GitHub

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

Jump to bottom

Rostislav / Wall-455 / Transaction list filter (Demo&Real) #9007

Merged
merged 45 commits into from
Jul 5, 2023
Merged

Rostislav / Wall-455 / Transaction list filter (Demo&Real) #9007

Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
7a0c87f
refactor: init pr
rostislav-deriv Jun 13, 2023
7c27aa8
feat: adding filter dropdown component
rostislav-deriv Jun 13, 2023
33230d2
Merge remote-tracking branch 'upstream/feature/wallets_with_traders_h…
rostislav-deriv Jun 14, 2023
4f370bc
feat: restructuring FiatTransactionList -> TransactionList + added th…
rostislav-deriv Jun 16, 2023
1f9019b
refactor: localize
rostislav-deriv Jun 16, 2023
f78dce5
refactor: appearance fixes
rostislav-deriv Jun 19, 2023
8a28caa
refactor: further appearance fixes
rostislav-deriv Jun 19, 2023
d6f90e3
refactor: grouping transactions now in utils
rostislav-deriv Jun 20, 2023
13ad7a9
refactor: minor change
rostislav-deriv Jun 20, 2023
afdd657
refactor: new hook
rostislav-deriv Jun 20, 2023
406c8f2
refactor: useWalletsList.ts changes by @sergei-deriv
rostislav-deriv Jun 20, 2023
fb1d2ef
refactor: continuation of the prev commit
rostislav-deriv Jun 20, 2023
969ccf8
refactor: typescript shenanigans
rostislav-deriv Jun 20, 2023
ce3149e
refactor: use wallet list
rostislav-deriv Jun 21, 2023
a24065c
refactor: moving stuff to hooks
rostislav-deriv Jun 21, 2023
dd34916
refactor: removed unused stuff for transaction-list.tsx
rostislav-deriv Jun 21, 2023
3b08c76
refactor: improving logic
rostislav-deriv Jun 21, 2023
63db595
refactor: test file
rostislav-deriv Jun 21, 2023
f3d5456
refactor: no more circular deps
rostislav-deriv Jun 21, 2023
355a5ab
refactor: improved hook
rostislav-deriv Jun 22, 2023
a6906dd
refactor: test
rostislav-deriv Jun 22, 2023
08b9fec
test: add tests (#10)
heorhi-deriv Jun 22, 2023
bd0dc50
Merge branch 'feature/wallets_with_traders_hub' of https://github.com…
heorhi-deriv Jun 22, 2023
65d9007
test: fix tests
heorhi-deriv Jun 22, 2023
c8563fd
fix: apply comments
heorhi-deriv Jun 22, 2023
19a33bf
fix: apply comments, refactor code
heorhi-deriv Jun 23, 2023
fd4925f
test: fix test
heorhi-deriv Jun 23, 2023
118abc0
test: reactor code
heorhi-deriv Jun 23, 2023
fc0587d
trigger build
heorhi-deriv Jun 23, 2023
883bcea
trigger build
heorhi-deriv Jun 23, 2023
2b7c258
refactor: resolved conflicts
rostislav-deriv Jul 4, 2023
26aae34
refactor: fixing appearance
rostislav-deriv Jul 4, 2023
2149bb8
refactor: merge target
rostislav-deriv Jul 4, 2023
7205738
update feature_branch with master (#9220)
mahdiyeh-deriv Jul 4, 2023
8e4e217
Merge remote-tracking branch 'upstream/feature/wallets_with_traders_h…
rostislav-deriv Jul 4, 2023
85e839c
refactor: mock data change
rostislav-deriv Jul 4, 2023
f768211
refactor: finish resolving
rostislav-deriv Jul 4, 2023
6ccbb79
refactor: remove package-lock.json changes
rostislav-deriv Jul 4, 2023
49e6286
refactor: fix tests
rostislav-deriv Jul 4, 2023
fccd00e
Merge branch 'feature/wallets_with_traders_hub' of github.com:binary-…
rostislav-deriv Jul 4, 2023
7295412
refactor: resolve some ts problems
rostislav-deriv Jul 4, 2023
886a290
refactor: resolve some ts problems
rostislav-deriv Jul 4, 2023
d1ce64f
refactor: one more small fix with the help of @heorhi-deriv
rostislav-deriv Jul 4, 2023
6302c9d
refactor: remove unused @ts-expect-error
rostislav-deriv Jul 4, 2023
cb31edb
refactor: remove fiat-transaction-list.tsx
rostislav-deriv Jul 4, 2023
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
2 changes: 1 addition & 1 deletion packages/appstore/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"@deriv/account": "^1.0.0",
"@deriv/api": "^1.0.0",
"@deriv/api-types": "^1.0.94",
"@deriv/hooks": "^1.0.0",
"@deriv/cashier": "^1.0.0",
"@deriv/components": "^1.0.0",
"@deriv/cfd": "^1.0.0",
Expand All @@ -37,6 +36,7 @@
"@deriv/trader": "^3.8.0",
nijil-deriv marked this conversation as resolved.
Show resolved Hide resolved
"@deriv/translations": "^1.0.0",
"@deriv/ui": "^0.8.0",
"@deriv/utils": "^1.0.0",
"classnames": "^2.2.6",
"formik": "^2.1.4",
"mobx": "^6.6.1",
Expand Down
49 changes: 0 additions & 49 deletions packages/appstore/src/components/fiat-transaction-list/fiat-transaction-list.scss
View file
Open in desktop

This file was deleted.

Loading