Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

[Claim refactor] Table / InvestmentFlow / Status #2138

Merged
merged 8 commits into from
Jan 13, 2022

Conversation

W3stside
Copy link
Contributor

Part 1 refactor of #2085

Just the components and some necessary props/data

@W3stside W3stside changed the title [Claim refactor] Table / investment status [Claim refactor] Table / InvestmentFlow / Status Jan 13, 2022
@W3stside W3stside requested review from a team January 13, 2022 18:18
@W3stside W3stside self-assigned this Jan 13, 2022
@@ -0,0 +1,70 @@
import { Trans } from '@lingui/macro'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moves html code from index into this file, adds global claim state null checks

commented out is claimedAmount which is formatted incorrectly. fix incoming

@@ -0,0 +1,102 @@
import { ClaimType, useClaimState } from 'state/claim/hooks'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moves table html code from index into this file, adds global claim state null checks

commented out is type code which i will fix in another PR - should be sdk types

@@ -0,0 +1,216 @@
import {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moves investment html code from index into this file, adds global claim state null checks and approveState / approveCallback from claim into this file as props

no internal changes

@github-actions
Copy link
Contributor

  • 🔭 GP Swap: Gnosis Protocol v2 Swap UI

@W3stside W3stside requested review from anxolin and nenadV91 January 13, 2022 18:41
* hooks index: logic/sdk

- set prices using Price SDK
- useUserEnhancedClaimData sugar
- cleanup / re-org

* utils: mapTypeToPrice

- maps claim types to their respective prices

* types: EnhancedClaimData

* Claim index: pass useEnhancedClaimData hook

* ClaimsTable: pass new data and type

* change back prices to previous

* revert to keep base types same

* fix broken claiming amount representation

* remove unused map

* map > switch

- thanks @alfetopito

* co-authored by @nenadV91
@W3stside W3stside added Auto-merge PRs with this tag will be automatically merged when approved and CI succeeds and removed Auto-merge PRs with this tag will be automatically merged when approved and CI succeeds labels Jan 13, 2022
@W3stside W3stside merged commit 8ef567f into claim Jan 13, 2022
@W3stside W3stside deleted the claim-refactor-table-investment-status branch January 13, 2022 23:11
@W3stside W3stside mentioned this pull request Jan 13, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants