You did both correctly.
For the first part, you can figure out most if it using only geometry. A right triangle with two equal sides is a 45-45-90 triangle. A right triangle with sides is a 30-60-90 triangle (where is the 30 degree angle). So, . This means .
You get the same answer either way.