They are both grammatically correct but the meaning is different. #1 is more natural. It means "she was very upset, but now she is less upset." #2 is awkward. It means "She isn't upset anymore, but now she isn't upset anymore." [repetitious]

Both are correct Shima. The first one is more natural, "used to be" isn't the best option for this context. Good job!