Changes looks good to me. Could you maybe open a PR on WPAndroid that targets this branch to make sure ewverything is ok now?

Android PR builds failed with a JitPack error:

https://jitpack.io/com/github/wordpress-mobile/gutenberg-mobile/fc7493eb81/build.log

Tried rebasing but got the same error:
https://jitpack.io/com/github/wordpress-mobile/gutenberg-mobile/c972d0d89a/build.log

@hypest maybe you have an idea?

Looking at the JitPack log:

jest-haste-map: Haste module naming collision: react-native-aztec
The following files share their name; please adjust your hasteImpl:

• /react-native-aztec-old-submodule/package.json
• /react-native-aztec/package.json

Looks like the "old-submodule" is still there. Not fully sure yet if this is essentially the same error that we got back in the day and that's why we decided to keep the old-submodule around 🤔 .

Or, perhaps we have to add a step in JitPack's config to rm -Rf the submodule folder which is probably checked out from the initial clone (before JitPack then switches the to branch under test). Does that make sense?

Not fully sure yet if this is essentially the same error that we got back in the day and that's why we decided to keep the old-submodule around 🤔 .

I think it was a different error before jitpack/jitpack.io#3707 mentioned here #486.

Or, perhaps we have to add a step in JitPack's config to rm -Rf the submodule folder which is probably checked out from the initial clone (before JitPack then switches the to branch under test). Does that make sense?

Let me try that 👍

It worked perfectly 🎉 Android build is now green as well: wordpress-mobile/WordPress-Android#11289