This repository has been archived by the owner on Jun 24, 2022. It is now read-only.
[RELEASE ⛰️ ] v1.10.0-RC.0 #2289
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add header and and hook basic logics * Add claim to menu * Rename token name * Add claim page route * Fix linter issues
Co-authored-by: Leandro Boscariol <leandro.boscariol@gnosis.io>
* Added vCow contract json abi * Added generated types for vCow contract * Added temporary rinkeby contract address * Added hook useVCowContract * Shaved off most of vCow ABI and left only a minimal set * Reset generated file to previous formating Co-authored-by: Leandro Boscariol <leandro.boscariol@gnosis.io>
* Added V_COW Token objects (only rinkeby for now) * Added GNO Token objects (will be used later) * Modded initial set of claim hooks * Restored and commented out original claim hooks on mod file * Added utils for checking what type of user claims are Not yet in use, will be useful later * Temporary hardcoded address for loading the claims in the UI * Removed unecessary `@src` import * Using the chain id enum rather than magic numbers Co-authored-by: Leandro Boscariol <leandro.boscariol@gnosis.io>
* Using the correct contract address * Refactored ClaimType from a type to an enum to align with contract * Added custom useClaimCallback * Replaced useClaimCallback with original version and commented it out * Updated mock claim data * Changed enum to const enum * Refactored types * Refatoring inner array types to re-use contract fn types And added comments * Refactoring getClaimedAmount helper fn Co-authored-by: Leandro Boscariol <leandro.boscariol@gnosis.io>
* Claim modal styles WIP. * Claim modal styles WIP. * Claim modal styles WIP. * Claim modal styles WIP. * Claim modal styles WIP. * Claim modal styles WIP. * Claim modal styles WIP. * Claim modal styles WIP. * Claim modal styles WIP. * Claim modal styles WIP. * Claim modal styles WIP. * Claim modal styles WIP. * Claim modal styles WIP. * Claim modal styles WIP. * Claim modal styles WIP. * Claim modal styles WIP. * Claim modal styles WIP.
* Added helper function to convert between repo and internal types * Refactored claim repo base url * Transformed repo claims into internal claims * New fake return data, now at the fetch level * Restored original useUserClaims and commented it out and added modded version * Removed unused import on hooksMod * Updating fake data and commenting out real implementation * Always show vCOW button, and renamed it to just vCOW * Refactor RepoClaimType Co-authored-by: Federico Giacon <58218759+fedgiac@users.noreply.github.com> * Removed unnecessary claim type mapping const Co-authored-by: Leandro Boscariol <leandro.boscariol@gnosis.io> Co-authored-by: Federico Giacon <58218759+fedgiac@users.noreply.github.com> Co-authored-by: L B <alfeto@macameba.local>
* Removed hardcoded claims from hooks * Added the real airdrop repo and a const for the branch name * Added helper function getClaimsRepoPath to have the path based on chainId * Added helper function getClaimKey * Maybe 'thing in array' is not a thing in JS. Let's go for .includes instead * Further customized claim fetching functions to work with multiple networks * Commented out the whole hooksMod file. Don't think it's needed anymore * Temporary changes to claim page to integrate the claim checking * Removed completely the custom claim/hooks/hooksMod file * Refactoring Boolean conditions Co-authored-by: David <david.sato64@gmail.com> Co-authored-by: Leandro <leandro.boscariol@gnosis.io> Co-authored-by: David <david.sato64@gmail.com>
* initial claim-page functionality * added mock data and some small fix * fix type Co-authored-by: nenadV91 <nenadwebdevelop@gmail.com>
- Updated claim enum usage and some other small changes - Fix: add language selector in top-level menu
* Added new methods to vCow contract's json interface and re-generated the types * Fixing bad merge reverting values back * Hard coding prices fetched from the contract for now * Added hook useDeploymentTimestamp to fetch contract deployment timestamp * Added helper hooks to check whether claim window is still open for each type * Properly calculating ETH value from vCowAmount * Short update to prices constants comment regarding the unit * Typo fix * Turned hasClaims into a boolean rather than number * Adding two dumb checks regarding investment window for testing * Using ms.macro lib for calculating weeks in ms * Using ethers parseUnits function * Refactored hooks to return always a boolean, never null * Made notive token price calculation chain based * Validating claims are still claimable on claim callback * Added new variables to callback hook deps Co-authored-by: Leandro <leandro.boscariol@gnosis.io>
* Removing debug logging statements * Improved logging for error conditions including both account & chain * Refactored _repoNetworkIdMapping to use SupportedChainId enum * Removed duplicated import added during merge Co-authored-by: Leandro <leandro.boscariol@gnosis.io>
# Summary Fixes #2007 Dropdown will be implemented in an other PR when we have all the data ready.   Before (dark backround on both themes):  # To Test 1. Open the page [`Profile`](https://pr2051--gpswapui.review.gnosisdev.com/#/profile)
* Filtering out expired claims from useUserAvailableClaims result * New hook useClassifiedUserClaims to get user claims, classified Co-authored-by: Leandro <leandro.boscariol@gnosis.io>
* claim state: actions * claim state: reducer * claim state: hooks * added state to main index * type enum * extrapolate EligibleBanner * removed eslint exception comment * createAction conversion * createReducer conversion and remove unnecessary types
…mary, nav, claim messages) (#2072) * move dummy ident * common types file * Component extrapolate: ClaimNav * Component extrapolate: ClaimSummary * Component extrapolate: ClaimAddress * Component extrapolate: CanUserClaimMessage * adds extrapolated components to index
* Refactored to use redux instead of context * Use one state property for claim status instead of multiple * Remove some left commented-out code
Update contract to new deployment
# Summary Adding vCOW balance to Profile page Simply loading the balance (if any) to replace the placeholder data <img width="930" alt="Screen Shot 2022-01-07 at 15 14 51" src="https://user-images.githubusercontent.com/43217/148619074-28e83425-678e-46bb-9bc4-c2481d625213.png"> # To Test 1. Load the test PK on rinkeby `0x044a6c3636d0e4a7d3c3ead9f9a470efff0390f8531545c6d58018fe89f8a7a5` 2. Go to Profile page * It should show how many vCOWs it has. * Accounts with no vCOW will show 0 * Networks where vCOW is not deployed (anything but Rinkeby) will not show the badge at all
Merge develop to claim
# Summary Fixes #1179 Before:  After:  # To Test 1. Open the page [`swap`](https://pr2122--gpswapui.review.gnosisdev.com/) 2. Connect a wallet while on xDai network 3. Pick xDai and wxDai 4. Check the token logos. Should look like the screenshot above.
* add data prop to addTransaction * mock testing function and impl * add claim to transaction state - add hooks as syntactic sugar * type claimData * getIndexes additional RepoClaims type * claim hooks mock tx edit and helper fn * claim page - add UI responsive to pending * styles * price map fix * claim page - add UI responsive to pending * styles * Use pending claims in unclaimed amount calculation * revert name and simplify * 0 if no claiming * set mock to an acct with claims (testing) * mod useUserHasSubmittedClaim * path fix Co-authored-by: nenadV91 <nenadwebdevelop@gmail.com>
…9AF075c (#2135) Co-authored-by: Leandro <leandro.boscariol@gnosis.io>
* New hook useInvestmentDeadline * New hook useAirdropDeadline * Refactoring out the unnecessary ternary operators Co-authored-by: Leandro <leandro.boscariol@gnosis.io>
* useTransactionConfirmationModal: make hooks to simplify * useREmainingAllowanceToApprove hook * useApproveCallbackFromClaim hook * index update draft 1 * style in approve * remove test code
* Refactor: ClaimingStatus * Refactor: ClaimsTable * Refactor: InvestmentFlow * add in new components and remove unused paths * InvestmentFlow: pass approve props * comment out broken parts for other PR * [Claim refactor] Logic changes & connecting real data (#2142) * 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
* Add badges and link to etherscan * Fix path
* Fix explorer link * Create new tx link component
* Simplify links * Remove unused
* Add link to the profile * Update link * Fix code style issues with Prettier Co-authored-by: Lint Action <lint-action@samuelmeuli.com>
* Change text * Fix period
* Add token to metamask * Add currency const
* Add link read more in footer, and inform about changing networks * Add network name * Remove link * Remove unused
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.2.0. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/ai/nanoid/blob/main/CHANGELOG.md">nanoid's changelog</a>.</em></p> <blockquote> <h1>Change Log</h1> <p>This project adheres to <a href="http://semver.org/">Semantic Versioning</a>.</p> <h2>3.2</h2> <ul> <li>Added <code>--size</code> and <code>--alphabet</code> arguments to binary (by Vitaly Baev).</li> </ul> <h2>3.1.32</h2> <ul> <li>Reduced <code>async</code> exports size (by Artyom Arutyunyan).</li> <li>Moved from Jest to uvu (by Vitaly Baev).</li> </ul> <h2>3.1.31</h2> <ul> <li>Fixed collision vulnerability on object in <code>size</code> (by Artyom Arutyunyan).</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/ai/nanoid/commit/23b136929a6d58f32e31b269534a3ce3f680a086"><code>23b1369</code></a> Release 3.2 version</li> <li><a href="https://github.com/ai/nanoid/commit/967788efce880960512f969a56f8f22f3fc20bae"><code>967788e</code></a> Remove TS test tools</li> <li><a href="https://github.com/ai/nanoid/commit/27eaa90cd207a7782bbcf17343092ae87dd62164"><code>27eaa90</code></a> Simplify new binary tool</li> <li><a href="https://github.com/ai/nanoid/commit/a9d91239931dc77506381874826d297aee71d6ef"><code>a9d9123</code></a> Update dependencies</li> <li><a href="https://github.com/ai/nanoid/commit/32b9bdaab1fbc28576b17de8516164ce0360f292"><code>32b9bda</code></a> Allows passing size or custom alphabet via cli as args (<a href="https://github-redirect.dependabot.com/ai/nanoid/issues/334">#334</a>)</li> <li><a href="https://github.com/ai/nanoid/commit/246d5f87b6b34e23b5e401bdf3da1f80c810ac4c"><code>246d5f8</code></a> Update vite</li> <li><a href="https://github.com/ai/nanoid/commit/afdf9c92b41427f35476fbe14b5af5d73dd7fbdb"><code>afdf9c9</code></a> doc: Fixed Typo (<a href="https://github-redirect.dependabot.com/ai/nanoid/issues/335">#335</a>)</li> <li><a href="https://github.com/ai/nanoid/commit/90a446fef3ecaac78e5af2ea01025c4f40182e2b"><code>90a446f</code></a> Update benchmark results</li> <li><a href="https://github.com/ai/nanoid/commit/8ba2319b579895cc1f9060b9946a44852f97c509"><code>8ba2319</code></a> bench: add <code>@napi-rs/uuid</code> v4 (<a href="https://github-redirect.dependabot.com/ai/nanoid/issues/333">#333</a>)</li> <li><a href="https://github.com/ai/nanoid/commit/f4257780ece488734a65c176e80c2fd8ab6aab8e"><code>f425778</code></a> Release 3.1.32 version</li> <li>Additional commits viewable in <a href="https://github.com/ai/nanoid/compare/3.1.30...3.2.0">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/gnosis/cowswap/network/alerts). </details>
Co-authored-by: Leandro <leandro.boscariol@gnosis.io>
Co-authored-by: Leandro <leandro.boscariol@gnosis.io>
* Do not block on EOAs low native balance * Updated InsufficientNativeBalance error message * Added estimatedGas and related boilerplate to claim redux state * Refactored useClaimCallback hook Split claimCallback in 3: - claimCallback - does the same as before - estimateGasCallback - exposed externally to estimate gas usage based on claim input - getClaimInput - internal callback to prepare claimMany call args * Refactored when claimInputData is calculated to be used when estimating gas * Estimating gas usage based on claimInput and storing it on redux * Refactored gas cost calculation and displayig it in the UI when needed * Using the gasMargin only for executing the call * We don't need to track whether it's a smart contract wallet Co-authored-by: Leandro <leandro.boscariol@gnosis.io>
* It's connected when `account` is set * Allow claim search when disconnected Co-authored-by: Leandro <leandro.boscariol@gnosis.io>
) * mod the mod * edit the modded trade and claim approve hooks * edit places in app using new hook params * fix approve logic conditional * change logic * [CLAIM - Approve] Wire new approve logic into app (fixes broken merge stuff also) (#2233) * move approve logic from Claim > InvestOption * helper utils * tweak claim approve hook * apply @nenadV91's suggested fix * path * allow investmentAmount ro take maxCost * remove investmentAmount * && instead of || * tweak to approve logic * fix rebase error
|
anxolin
reviewed
Jan 25, 2022
* create hook and button * change message * messages * add revoke approve operationtype * delete previousr revoke approve cb * add modalMessage optional type * add revokeApprovalCallback to original approve callback mod * add revoke to investOption and change labels * change return type to object * styles * remove revoke UI elements and handlers
* Disable claiming * Disable claiming for prod and barn
* Added full amounts on hover for all claims values * Storing raw vCow amount rather than the formatted amount * Displaying the max amount on hover also on success view Co-authored-by: Leandro <leandro.boscariol@gnosis.io>
alfetopito
approved these changes
Jan 25, 2022
| @@ -1,7 +1,7 @@ | |||
| import { loadingOpacityMixin } from 'components/Loader/styled' | |||
There was a problem hiding this comment.
Likely modified the wrong file.
Should have created a mod but instead changes were applied to original files
alfetopito
force-pushed
the
release/1.10
branch
from
6eee223
to
926736c
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DO NOT SQUASH
DESCRIPTION
Claim stuff
This time hidden on: prod, barn and ens. Still visible everywhere else, including staging.
CHANGELOG
6eee223 Removed unused flag IS_CLAIMING_ENABLED (it's defined elsewhere)
d1fbb50 Added full amounts on hover for all claims values (#2282)
3bcd42f Remove cow claim button desktop. (#2292)
435874c Disable claiming: BARN / PROD / ENS (#2298)
22eb955 Disable vCow balance dropdown on profile page (#2291)
7355deb [Claim] Revoke Approval hook (#2249)
a8d90c6 [Claim-Approve] Hook optional amountToCheckAgainstAllowance param (#2175)
19adb51 Check claims disconnected (#2281)
9b3cde3 Pr2256/follow up (#2279)
f58f3f0 vCOW EVERYWHERE! (not vCoW) (#2283)
49425bf Set initial claim invest input amount to an empty string (#2280)
1a0e727 Bump nanoid from 3.1.30 to 3.2.0 (#2257)
456c121 Responsive balance indicator. (#2272)
f4dd347 Add link read more in footer, and inform about changing networks (#2265)
142baaf add paragraphs (#2278)
88c3ce0 Add token to metamask (#2267)
202db80 Change text (#2268)
bdb4403 Add link to the profile (#2269)
71ecc44 Simplify links (#2266)
b7f82f0 Fix Gnosis Safe claiming Workflow (#2277)
35ba6b3 Add badges and link to etherscan (#2264)
aa5a8a2 Add moo sounds (#2259)
b1335dc Warning claim too much eth (#2256)
f4ae160 Claimed amount on success screen (#2253)
f5fe248 Dropdown component for vCOW balance (#2156)
2ffd5fe Add Recipient toggle (#2013)
0073200 Merge branch 'master' into develop
bb7b1a1 Lowercasing searched address to find it on chunk file (#2260)
ca3b4bd Claim invest general error msg (#2254)
b9523af Deployment in all networks (#2258)
4603884 Disable claim review on zero or not approved (#2250)
6499a5b Add external links to const. (#2252)
b3c8e1b Merge branch 'master' into develop
56fbeb1 Create and implement a Stepper component. (#2246)
26e7540 Disable claim review on errors (#2241)
5bbc4d8 Fix duplicate CSS properties. (#2243)
a76e668 Consistent locale on claim (#2240)
7b5ed4f Total vcow on investment summary (#2237)
77a9d57 Change account fixes (#2238)
d0cfce8 Pr2235/follow up (#2239)
edac11d Fix for investment amount reset when you go back (#2247)
0132fe7 Update address error msg text (#2248)
0a41de3 Claim partial investments (#2234)
b4ea095 Pr2232/follow up (#2236)
d775d94 Claim pending icon spinner and show timezone. (#2235)
81be361 Fixes the process console error (#2231)
ef171d2 Claim style improve 20 (#2232)
9f4605d Merge branch 'claim' into develop
ffb70c8 Hide claim button for claiming/claimed states (#2222)
9367f94 Fix for selectedAll field (#2226)
9615e5f Add link claiming (#2224)
eca3a88 Simplify error messages (#2217)
172b7ce Claim instead of claim (#2220)
5aab634 Misc styling (#2228)
a116ab5 Claim last investment page (#2227)
e8dbe09 Change contract (#2210)
f35c12f [CLAIM] Button refactor and error fix (#2218)
5d43dc5 Merge branch claim-investment-flow-3 into claim
8c95bba Fix error on bad merge
2146760 Improve input field claim (#2186)
391f26c Revert "New claim contract abi (#2194)"
a657285 Created type for price fn names (#2205)
7751865 [Claim-Reject-Modals] Fixes empty modal (#2204)
7099b6f [Claim] Rejected/failed/errors in claim flow (#2169)
7029923 Claim change account (#2173)
a57a283 New claim contract abi (#2194)
842d37d Claim investment (#2191)
1c15ca5 Claim dynamic prices (#2182)
45c0b23 Merge pull request #2163 from gnosis/claim-investment-flow-2
95fa842 Invest amount calculation update
fd056b1 Merge branch 'claim' into claim-investment-flow-2
9f448bf Merge branch 'claim-investment-flow-2' of github.com:gnosis/cowswap into claim-investment-flow-2
704c508 Update for initInvestFlowData
172fe43 Rename constacts (#2180)
8502d80 Claim style improve 10 (#2174)
ba6ff22 Fix bad merge (#2184)
6277b03 Use airdrop claim end date (#2178)
1599ccf 2120/refactor time hooks (#2179)
b7f6eee Pr2160/follow up (#2176)
d90b526 Merge branch 'claim' into claim-investment-flow-2
46410cc PR updates
325efc1 2120/claim countdowns (#2158)
706011e remove progress bar from Profile page (#2177)
0b6b4b7 Fix native investment (#2123)
2f2f1cb Wording change and CSS cleanup. (#2170)
00195a9 new progressbar component of claim branch && more values available (#2060)
edd210a Merge branch 'master' into develop
af68256 [Claim - ClaimTable - Pending] - Show loader and minor style change (#2162)
1346e0b Updated invest percentage logic
345c482 Moved invest data redux
a07c696 WIP styling investment flow. (#2152)
4c41c57 2139/claim identicon (#2161)
d1cd9a6 Fix free claims (#2160)
2830c00 Fixing assumtion regarding data format stored on redux (#2159)
5d21047 [Claim Approve] Approve button async logic and styles (#2155)
37fcffd Use theme colors. (#2113)
e492c21 Small claim fixes (#2153)
bd559e6 [Claim - Approve] -> USDC (#2154)
84a384d [Claim refactor] - Split InvestmentFlow and minor slider impl. (#2144)
9899670 Replace Gnosis Protocol --> CoW Protocol (#2140)
75d4d33 Change redux store on success claiming (#2141)
f560da0 Add claim finalized middleware (#2126)
8ef567f [Claim refactor] Table / InvestmentFlow / Status (#2138)
f3d027b get the chainId specific GNO (#2143)
2deafd3 [Claim] Approve flow - GNO approve (#2130)
51cde4f Refactor claim timestamp hooks (#2127)
f2765ea Updating vCOW contract address to 0x71A377EC0026A8E35AfD082d54E2f62d39AF075c (#2135)
8a83dd9 [CLAIM] Pending claim UI (#2049)
ddf8ca6 Update xdai and wxdai token logo (#2122)
fee0156 Merge pull request #2124 from gnosis/merge-develop-to-claim
5d7aa61 Merge branch 'develop' into claim
be65cac vCOW on profile (#2062)
ab29d42 Merge pull request #2086 from gnosis/update-contract
9af6cbf Update contract
224dab3 Claim refactor index redux (#2077)
f92674b [Claim refactor index] - Part 1 - Extrapolate 5 small components (summary, nav, claim messages) (#2072)
48d1b7a [Claim] Context state (#2064)
efc1af0 Claim hooks 4 exclude expired claims (#2059)
6272c54 [Claim] Profile: vCOW balance (#2051)
0bd3858 Pr2052/follow up (#2055)
efcb9ad Claim hooks 3 (#2056)
309753c Updated claim enum and fix language selector
42e307a Updated claim enum usage and some other small changes
319d7a9 Claim page 2 rebased (#2054)
c053cf2 Real airdrop repo (#2052)
8d53e6b Claim hooks 2 - ready to fetch (#2043)
956c342 Claim flow styles (#2042)
d2060bb Claim hooks pt 1 - useClaimCallback (#2041)
52b416f Claim hooks part 0 (#2032)
b1628bb vCow contracts (#2029)
fccf884 Added ClaimType type (#2025)
325e3ea Basic claim (#2000)