chore(1-3342): extract into hook, use new endpoint if flag on (#9218)

chore(1-3342): extract into hook, use new endpoint if flag on (#9218) #7278