thunderbiscuit / padawan-wallet

The bitcoin wallet trainer on Android.
https://padawanwallet.com/
Apache License 2.0
111 stars 49 forks source link

Refactor: Separate views into individual files #347

Closed geigerzaehler242 closed 7 months ago

geigerzaehler242 commented 7 months ago
thunderbiscuit commented 7 months ago

Awesome! The unit tests are failing not because of this PR at all, so I'm diregarding them at the moment (will fix in a further PR).

This looks pretty good. I think all you'd need is to clean up the commit history. A few pointers:

  1. You committed your previous PR on the master branch, and that's going to cause you trouble as those get merged. In this case for example, you'd want to PR from a different branch on your fork onto the master branch of this repo. Instead you're attempting to merge your master onto mine, which is why it's messier than it needs to be.
  2. The above made it so that the commits you had yesterday are now orphaned and git is trying to replay them on top of master + adding the merge. To clean this up, here is what I suggest: (a) create a new branch off of your master called something like separate-views, and open a new PR with that onto my master; (b) squash all 4 commits into 1, which will clean up your unintentional old commits and the merge commit. You can then force push those changes to your branch, which will update your PR.

Happy to help with any of those steps if you'd like a more detailed approach. Cheers!