Merge: Tx Details with Tax Categories

[HashEngineering]

Issue being fixed or feature implemented

We need to merge master into feature-tx-details-export to fix merge conflicts

Related PR's and Dependencies

Screenshots / Videos

How Has This Been Tested?

• [ ] QA (Mobile Team)

Checklist:

• [ ] I have performed a self-review of my own code and added comments where necessary
• [ ] I have added or updated relevant unit/integration/functional/e2e tests

[HashEngineering]

I will try to fix these merge conflicts