No I don't want to close it if it is not solved, but you did say that a solution you were given over on GitHub seemed to solve your problem. I was just trying to clean things up.
Not knowng anything about Firestore, I'll bow out of this thread and maybe someone else with Firestore experience will jump in to help you.