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

Batch 1 - fix for vue view list and add team members #7354

Merged

Conversation

zoek1
Copy link
Contributor

@zoek1 zoek1 commented Sep 11, 2020

Description
Refers/Fixes

#7319
#7352

Testing

@zoek1 zoek1 changed the base branch from master to round-7-integration September 11, 2020 07:54
@codecov
Copy link

codecov bot commented Sep 11, 2020

Codecov Report

Merging #7354 into round-7-integration will increase coverage by 0.01%.
The diff coverage is 16.66%.

Impacted file tree graph

@@                   Coverage Diff                   @@
##           round-7-integration    #7354      +/-   ##
=======================================================
+ Coverage                26.33%   26.35%   +0.01%     
=======================================================
  Files                      306      306              
  Lines                    30285    30287       +2     
  Branches                  4470     4471       +1     
=======================================================
+ Hits                      7977     7983       +6     
- Misses                   22033    22034       +1     
+ Partials                   275      270       -5     
Impacted Files Coverage Δ
app/grants/views.py 14.82% <16.66%> (-0.04%) ⬇️
app/quests/views.py 16.22% <0.00%> (ø)
app/dashboard/views.py 10.50% <0.00%> (ø)
...rketing/management/commands/no_applicants_email.py 0.00% <0.00%> (ø)
...eting/management/commands/assemble_leaderboards.py 39.73% <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 f2457a3...6ad1924. Read the comment docs.

@thelostone-mc thelostone-mc merged commit 28fbbed into gitcoinco:round-7-integration Sep 11, 2020
thelostone-mc added a commit that referenced this pull request Sep 14, 2020
* Add zkSync Checkout (#7314)

* 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 (#7336)

* 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 <[email protected]>

* fixes #7223

* zkSync updates part 2 (#7348)

* 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 <[email protected]>

* updated dates, just in case we got it wrong with db migration

* round up fixes

* fix for the anonymous user issue

* fix up clr info on cards

* show contribution button only if user has logged in

* update icon

* hide browse grants button

* rounding issue

* reload page on switch type/category

* fix grants without round

* fix favorite

* fix component initialization

* eslint fix

* fix grant activity

* sloppy fix

* a few fixes

* add pagination

* readd stuff

* switch btwn rinkeby+mainnet &show sybil info

* Fix my grants and add team members (#7354)

* Grants Round 7 Trust Bonus Improvements (#7353)

* 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

* fix for loading sidecart

* debounce search

* remove already loaded scripts

* move filter "my grants"

* zkSync updates part 3 (#7356)

* Update tx validator to support zkSync transfers when user already has funds on L2

* Add loading screen to zkSync modal

* Improve gas estimates, recommend checkout approach to user, limit zkSync to 100 contributions

* Change zkSync fees to be additive, show which tokens in cart don't support zkSync

* Fix so all zksync gas limit estimtes are strings

* Bug fixes to cart and tx validator

* Update cart copy and add zkSync details to GRANTS.md

* Update GRANTS.md

* adds grant funding info; per lefteris feedback

* adds grant funding info; per lefteris feedback

* fix for sms verification

* ads trust tab coming soon stuff

* stopgap for #7131 (comment)

* new grants header

* zkSync bug fixes (#7368)

* Fix zkScan URLs

* Ensure default network is mainnet

* Impove how tokens are fetched, close zksync modal on 'insufficient balance' errors

* Bug fix: prevents users from checking out when donation amounts + fees exceed their L1 wallet balance

* matic banner

* round 7 integration; adds brightid events to calenndar

* udpates img

* styles for banners and grid fixes

* Additional cart improvements (#7374)

* Add gas estimation for approval txs

* Fixes for Argent and BN, CSS tweak for mobile

* helper script to re-add team members that were removed by #7319

* updates grant scripts

* adds learn more link

* adds brightID info to sybilscore

* iexact

Co-authored-by: Matt <[email protected]>
Co-authored-by: Miguel Angel Gordián <[email protected]>
Co-authored-by: owocki <[email protected]>
Co-authored-by: octavioamu <[email protected]>
Co-authored-by: Ben DiFrancesco <[email protected]>
zoek1 added a commit to zoek1/web-1 that referenced this pull request Sep 14, 2020
zoek1 added a commit to zoek1/web-1 that referenced this pull request Sep 14, 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.

2 participants