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

Load all grants based on current filters into the cart #7371

Closed
wants to merge 57 commits into from

Conversation

zoek1
Copy link
Contributor

@zoek1 zoek1 commented Sep 14, 2020

Description

image

Refers/Fixes

#7164

Testing

mds1 and others added 30 commits September 9, 2020 21:40
* Integrate minimal working ETH-only zkSync checkout

* Refactor L1 checkout a bit to enable more code re-use with zkSync

* Adds full working checkout flow using localstorage, supports ERC20 + ETH

* Improve checkout UX by adding modal whehn using zkSync

* Warn user before closing or reloading if they started zkSync checkout

* Switch to deterministic from ephemeral wallet, fix allowance bug

Allowance bug info: If user already had sufficient allowance, tokens were not transferred

* Pull out logic into functions to facilitate re-sending on interrupted deposits

* zkSync checkout now POSTs to database and shows success message on completion

* Handle zkSync checkout interruptions

* Fix ESLint errors, add some try/catch blocks

* Fix bug in tx validator that prevented testing on rinkeby

Also some prep and cleanup for tx validator update

* Update tx validator to handle zkSync transfers

* Tweak: Show metamask popup on zkSync checkout prompts

* Only allow zkSync modal to be closed with a button to prevent accidental closures when checking out

* zkSync checkout can now be resumed if interrupted

Adds endpoint to look for dropped and replaced transactions to help with this

* Various UI/UX updates based on Figma mockups

- Update tx processing section of zkSync checkout modal
- Update grant detauls page to show Etherscan and zkScan links
- Add note about supported L2 account types on new grant page

* Update address of batch deposit contract

* Reduce gas by only using batch deposit contract when necessary, regular zkSync contract otherwise

* Now throws error if user tries to use zkSync checkout with unsupported token
* add list view for grants and migrate to vue

* hide idle grants by default

* Add contributions on grants

* add my grants

* Minor fix

* Implement follow in vuejs

* remove duplicated ids

Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com>
* Checks and validates cart amounts to ensure they are packable

* Add support for additional deposits. After donations are complete, all leftover balances are sent to user's web3 address

* Update appearance of zkSync modal to match new designs

* Add additional checkout flow to support users who already have a zkSync balance

* Update detail.js

Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com>
* Show SMS on trust bonus page w/ conditional verify button or status

* Add placeholder for twitter verification & handle SMS verification via cart link

* Conditionally show Trust Bonus banner in cart

* Include link in cart trust bonus button + bonus screen touchups

* Increase the size of the BrightID QR Code

* Fix linting indentation error
@codecov
Copy link

codecov bot commented Sep 14, 2020

Codecov Report

Merging #7371 into round-7-integration will increase coverage by 0.02%.
The diff coverage is 9.09%.

Impacted file tree graph

@@                   Coverage Diff                   @@
##           round-7-integration    #7371      +/-   ##
=======================================================
+ Coverage                26.29%   26.31%   +0.02%     
=======================================================
  Files                      306      306              
  Lines                    30390    30350      -40     
  Branches                  4487     4481       -6     
=======================================================
- Hits                      7992     7988       -4     
+ Misses                   22128    22092      -36     
  Partials                   270      270              
Impacted Files Coverage Δ
app/grants/urls.py 100.00% <ø> (ø)
app/grants/views.py 14.39% <9.09%> (-0.02%) ⬇️
app/grants/utils.py 21.05% <0.00%> (-3.05%) ⬇️
app/grants/models.py 42.26% <0.00%> (-0.26%) ⬇️
...perftools/management/commands/create_page_cache.py 0.00% <0.00%> (ø)
app/dashboard/embed.py 31.60% <0.00%> (+3.44%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7118fae...6b8734d. Read the comment docs.

@owocki
Copy link
Contributor

owocki commented Sep 14, 2020

ooooh im excite about this functionality

base_params['idle'] = this.idle_grants;
}

if (this.show_contributions) {
Copy link
Contributor

@owocki owocki Sep 14, 2020

Choose a reason for hiding this comment

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

is there a way to DRY this so that if we add a new filter on the left side, it doesnt break the add all to cart functionality?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think in some other opportunity we should dry the filters in general then we can reuse it here

@owocki
Copy link
Contributor

owocki commented Sep 14, 2020

left 1 comment; curiou swhat @thelostone-mc thinks tho

@octavioamu
Copy link
Contributor

is duplicating grants maybe because is mixing numbers with strings

@octavioamu
Copy link
Contributor

seems no_report is not used

owocki and others added 4 commits September 14, 2020 13:22
* Add twitter verification for grants

* Update logic to display grant verified badge

* Fixes based on feedback

* Update security fro verify grants

* Fix attribute error

* Remove twitter sdk
@octavioamu octavioamu changed the base branch from round-7-integration to master September 14, 2020 20:23
@octavioamu
Copy link
Contributor

turning into draft, @zoek1 let us know when conflicts get fixed

@octavioamu octavioamu marked this pull request as draft September 23, 2020 14:57
@zoek1
Copy link
Contributor Author

zoek1 commented Sep 30, 2020

@octavioamu this was included in #7446

@zoek1 zoek1 closed this Sep 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants