I'm looking for going from T-mobile variant to International. I did it a while back with the OP7PRO and wasn't this easy. Is this actually how you do it now?
By broken do you mean its not detecting your fingerprint? are you using a screen protector? If you send it to OnePlus with a Lock on it they will refuse it and probably keep it if they follow Sammys practices...