Student or Learner
Are the Past Perfect Simple and the Past Perfect Continuous used correctly in the following sentence?
Joanne was overjoyed when her long-time boyfriend had finally proposed. They had been dating since college and only moved in together last year.
So if I change from "when" to "that", "had finally proposed" is OK?