Yup, both should rebloom if you deadhead them. It won't be as prolific as the first flush, though.

I haven’t had catmint in a few years but I feel like I used to hack it back aggressively and it would regrow and rebloom

Am I suppose to trim catmint and salvia after the blooms die?

Will it bloom again later in the summer or in the Fall?