Update thedevelop-userTypeFix branch with the latest features from develop - Fundraising / Recurring Events

[palisadoes]

Is your feature request related to a problem? Please describe.

1. We recently fixed the usage of userType with this PR.
   1. Fix/user type #1830
2. A new develop-userTypeFix branch was created to add this feature
3. We need to make sure that the develop-userTypeFix branch:
   1. Maintains its current functionality
   2. Includes any new features in the develop branch and adjusts them to the new userType functionality.
   3. Has all valid and passing tests that maintain our current test code coverage levels

This is required to support new Fundraising and Recurring events features added to develop:

1. https://github.com/PalisadoesFoundation/talawa-api/pulls?q=is%3Apr+is%3Amerged+funds
2. https://github.com/PalisadoesFoundation/talawa-api/pulls?q=is%3Apr+is%3Amerged+recurring

Describe the solution you'd like

1. Merge develop into the develop-userTypeFix branch
2. Make sure all newly added features to the develop branch are included in the develop-userTypeFix branch.
3. The new functionality of userType must be unchanged.
4. No other features must be affected
5. All tests must be valid and pass

Describe alternatives you've considered

• N/A

Approach to be followed (optional)

• See above

Additional context

1. This is going to require someone with experience with the repo, or proven long term experience with typescript, MERN, and / or graphQL in their GitHub profile

Research these issues for context with the new userType functionality:

1. API: Fix the usage of userType #1711
2. Fix/user type #1830
3. Mobile: Fix the usage of userType talawa#2373
4. Admin: Fix the usage of userType talawa-admin#1445
5. Update the Organization People Screen Design and Functionality talawa-admin#1451
6. Update the Community Users Screen Design and Functionality talawa-admin#1452
7. Update adminApproved to expected functionality in the develop-userTypeFix branch #1862
8. Update thedevelop-userTypeFix branch with the latest features from develop - Fundraising / Recurring Events #1904

Potential internship candidates
Please read this if you are planning to apply for a Palisadoes Foundation internship

• Student Internship Programs talawa#359

[its-VinayKumar]

@palisadoes Plz assign me this issue.

[palisadoes]

@its-VinayKumar

As described in the issue, this is going to require someone with experience with the repo, or proven long term experience with typescript, MERN, and / or graphQL in their GitHub profile. Do you have that?

[AdityaRaimec22]

@palisadoes Can I get assigned to the issue. I have all the required skills and also merged a PR #1810 which shows this.

[NamitBhutani]

@palisadoes Can I work on this?

[Cioppolo14]

@AdityaRaimec22 I am going to assign you because of your profile experience/skills and history with our repos.

[palisadoes]

@AdityaRaimec22

Have the newly merged PRs been a challenge for this work?

[AdityaRaimec22]

@AdityaRaimec22

Have the newly merged PRs been a challenge for this work?

When I started the work of merging the develop branch into develop-userTypeFix branch I got merge conflicts in nearly 191 files after solving them the count has reduced to 35 files I will solve all the conflicts then run tests and will check the functionality as well. Till now the only challenge was that the number of files having merge conflict was quite high.

[palisadoes]

Thanks. I was concerned that it would be too challenging.

I hope the last set will be manageable.

Let us know if there are any unexpected delays

[palisadoes]

Reopening. This was not fixed

[palisadoes]

@AdityaRaimec22 Are you still working on this?

[AdityaRaimec22]

@AdityaRaimec22 Are you still working on this?

Yes @palisadoes I am still working on this will commit changes ASAP.