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

Add QR Code Generation Support and Order Creation #6719

Closed
wants to merge 23 commits into from

Conversation

SudharakaP
Copy link
Member

@SudharakaP SudharakaP commented Aug 3, 2021

⚠️ Should only be merged after completing opencollective/opencollective#4484

Resolve opencollective/opencollective#4516

Related API PR: opencollective/opencollective-api#6378

crypto-contribution-flow

image

…ntribution-flow-elements

# Conflicts:
#	components/collective-page/sections/Contribute.js
#	components/contribute-cards/ContributeCrypto.js
#	components/edit-collective/sections/Tiers.js
#	lang/ca.json
#	lang/cs.json
#	lang/de.json
#	lang/en.json
#	lang/es.json
#	lang/fr.json
#	lang/it.json
#	lang/ja.json
#	lang/ko.json
#	lang/nl.json
#	lang/pt-BR.json
#	lang/pt.json
#	lang/ru.json
#	lang/uk.json
#	lang/zh.json
#	lib/collective.lib.js
#	lib/tier-utils.js
# Conflicts:
#	components/contribute-cards/ContributeCrypto.js
#	lang/ca.json
#	lang/cs.json
#	lang/de.json
#	lang/en.json
#	lang/es.json
#	lang/fr.json
#	lang/it.json
#	lang/ja.json
#	lang/ko.json
#	lang/nl.json
#	lang/pt-BR.json
#	lang/pt.json
#	lang/ru.json
#	lang/uk.json
#	lang/zh.json
@vercel
Copy link

vercel bot commented Aug 3, 2021

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployments, click below or on the icon next to each commit.

opencollective-frontend – ./

🔍 Inspect: https://vercel.com/opencollective/opencollective-frontend/vtrWjajJoEP3X8guUrzEEYfnNK6j
✅ Preview: https://opencollective-frontend-git-feat-add-qr-c-778272-opencollective.vercel.app

opencollective-styleguide – ./

🔍 Inspect: https://vercel.com/opencollective/opencollective-styleguide/nmHNPcVpYKqraXEAvKCuaNdgev9B
✅ Preview: https://opencollective-styleguide-git-feat-add-qr-dac3b1-opencollective.vercel.app

@SudharakaP
Copy link
Member Author

Everything in this PR is contained in #6725 and thus I am closing this.

@SudharakaP SudharakaP closed this Aug 10, 2021
@SudharakaP SudharakaP deleted the feat/add-qr-code-generation-support branch August 10, 2021 06:52
@znarf
Copy link
Member

znarf commented Aug 10, 2021

@SudharakaP why are you closing the PR and decided to mix up 2 PRs together? I'm afraid it's just making reviewing difficult. Also the title and description of the open PR doesn't make sense anymore.

@znarf
Copy link
Member

znarf commented Aug 10, 2021

Also, #6725 doesn't seem up to date, many things that were addressed are not fixed.

@SudharakaP
Copy link
Member Author

@SudharakaP why are you closing the PR and decided to mix up 2 PRs together? I'm afraid it's just making reviewing difficult. Also the title and description of the open PR doesn't make sense anymore.

@znarf : Sorry, this is what happened. Initially, when I created the issues, I separated the issues into three parts mainly. 1) designing of the settings part of the crypto flow, 2) Adding crypto flow sections for the contribution flow, 3) adding the QR code and the final success screen. And then I opened the first PR, and rather than waiting for the completion of the code reviews I started working second and third parts as well.

Now maybe the best method was to add the whole Crypto flow in one PR. But my initial plan was to rebase the PRs and keep it in sync which is what I followed; although I couldn't keep up with syncing the PR everyday rather resorted to syncing them after the code reviews are done and the first PR is merged. Next time I should have a better separation of tasks or maybe explain my plan better in the beginning. 🙂

Also, #6725 doesn't seem up to date, many things that were addressed are not fixed.

This is rebased. Please check again, now it should be all updated. 🙂

@SudharakaP
Copy link
Member Author

SudharakaP commented Aug 10, 2021

@znarf : Also I've changed the title and description of the other PR; #6725 has been updated. Sorry for the trouble, but I think it should be all good now. Let me know if you see any issues.

@znarf
Copy link
Member

znarf commented Aug 10, 2021

Splitting the work in multiple PRs is the way to go. We absolutely don't want giant PRs, they're impossible to review and lead to problems. I would even say that it's not normal that we're working on PRs that are in review for more than 1 week, where we're not keeping track of the number of review rounds. This shows that they're even too big themselves.

But my initial plan was to rebase the PRs and keep it in sync which is what I followed; although I couldn't keep up with syncing the PR everyday rather resorted to syncing them after the code reviews are done and the first PR is merged.

While potentially a bit painful, your original plan was the right one, it should normally be manageable, way to go.

@SudharakaP
Copy link
Member Author

Splitting the work in multiple PRs is the way to go. We absolutely don't want giant PRs, they're impossible to review and lead to problems. I would even say that it's not normal that we're working on PRs that are in review for more than 1 week, where we're not keeping track of the number of review rounds. This shows that they're even too big themselves.

But my initial plan was to rebase the PRs and keep it in sync which is what I followed; although I couldn't keep up with syncing the PR everyday rather resorted to syncing them after the code reviews are done and the first PR is merged.

While potentially a bit painful, your original plan was the right one, it should normally be manageable, way to go.

@znarf : Surely, I'll keep these in mind, in addition for now I'll do re-basing only until we get this RFC clarified; opencollective/opencollective#4367

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add QR Code for Crypto Deposit Address
2 participants