HSA contribution limit (for 2019) if I have a HDHP and my spouse has secondary insurance on it

For 2019,

 

- I had a HDHP plan thru my employer

- My spouse had a PPO plan thru her employer

- My spouse had secondary insurance on my plan. I went thru the COB (Co-ordination of benefits) process and it was determined that I could contribute up to the 'Family limit' of $7000 to my HSA, which is what I did.

 

Was the right thing done?

If so, when using tubotax, for the question 'What type of HDHP coverage did I have for 2019?', do I select myself as being under a family plan

 

And under 'What type of HDHP did my spouse have on December 1, 2019?', should I select Family, Self-Only or None? (She had secondary HDHP insurance and primary PPO insurance.)