Based on this. 

The woman with the sword belongs to the lovely @rosella-writes and her name is Virelan Lavellan. 

P.S. If you want to read Rosella’s extremely flirty and fun ficlet featuring the Solas with the semi-transparent shirt and staff, here you go.