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

feat: add new educational sections in english #2704

Merged

Conversation

leesalminen
Copy link
Contributor

This adds the new education sections from https://github.com/galoymoney/earn.

@leesalminen
Copy link
Contributor Author

GaloyMoney/earn#24
This PR adds a new shell script that processes the source yaml files to the appropriate json structure for the mobile app

#2704
This one adds the English translation for the new sections
I'm not currently able to run this in the simulator but it matches up to the work I did in our fork that does work so should be good? YOLO

GaloyMoney/blink#3306
This one adds the point allowances to the back end for the new sections

@UncleSamtoshi
Copy link
Contributor

Thanks for the pr! Two pieces of feedback:

  • Could you instead make the edits to app/i18n/en/index.ts? For our translation pipeline, we make all changes to app/i18n/en/index.ts and then we run yarn update-translations to auto generate app/i18n/raw-i18n/source/en.json.
  • In order to keep a semantic git history we structure our commits using conventional commits https://www.conventionalcommits.org/en/v1.0.0/

@leesalminen leesalminen force-pushed the feat/additional-education-sections branch from 6101635 to eb9aacd Compare October 12, 2023 16:28
@leesalminen
Copy link
Contributor Author

Thanks for the pr! Two pieces of feedback:

  • Could you instead make the edits to app/i18n/en/index.ts? For our translation pipeline, we make all changes to app/i18n/en/index.ts and then we run yarn update-translations to auto generate app/i18n/raw-i18n/source/en.json.
  • In order to keep a semantic git history we structure our commits using conventional commits https://www.conventionalcommits.org/en/v1.0.0/

done

@leesalminen leesalminen force-pushed the feat/additional-education-sections branch 2 times, most recently from cc6f10e to 07d3020 Compare October 12, 2023 16:46
@leesalminen leesalminen changed the title add the english version of the new education sections feat: add new educational sections in english Oct 12, 2023
@leesalminen leesalminen force-pushed the feat/additional-education-sections branch 2 times, most recently from e4d3259 to e44421f Compare October 12, 2023 16:59
@UncleSamtoshi
Copy link
Contributor

Thanks for making the requested changes! Was your intention to just add the resources to the mobile application or to make them live within the app? Currently the sections are not live and there requires a little more configuration to make it live.

@leesalminen leesalminen force-pushed the feat/additional-education-sections branch 2 times, most recently from fb2fc61 to 38af938 Compare October 13, 2023 00:31
@leesalminen
Copy link
Contributor Author

leesalminen commented Oct 13, 2023 via email

@leesalminen leesalminen force-pushed the feat/additional-education-sections branch from 38af938 to 6b679da Compare October 17, 2023 13:55
@leesalminen
Copy link
Contributor Author

hey @UncleSamtoshi - I'm finally able to get a simulator for the upstream app and can confirm the new sections are showing up now.

Screenshot_1697549011

@UncleSamtoshi
Copy link
Contributor

Thanks for making those changes. Can you run yarn eslint:fix in order to get the "Check code" github action to pass? Additionally can you get the tests to a working state? It may require a rebase.

@UncleSamtoshi
Copy link
Contributor

I belive this PR needs to be merged before the current pr. I am waiting to merge to approve that pr till I get confirmation from the team that we can effectively prevent fake accounts from getting the increased rewards.

@leesalminen leesalminen force-pushed the feat/additional-education-sections branch 2 times, most recently from 1a70b37 to 52a61bd Compare October 18, 2023 18:46
@leesalminen leesalminen force-pushed the feat/additional-education-sections branch from 52a61bd to a7c2352 Compare October 18, 2023 19:47
@leesalminen
Copy link
Contributor Author

Thanks for making those changes. Can you run yarn eslint:fix in order to get the "Check code" github action to pass? Additionally can you get the tests to a working state? It may require a rebase.

check-code and tests are now passing.

@UncleSamtoshi UncleSamtoshi merged commit fc67c11 into GaloyMoney:main Oct 18, 2023
7 checks passed
leesalminen added a commit to leesalminen/galoy-mobile that referenced this pull request Oct 24, 2023
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