Updated login action and registration action for changes in OTP
Updated login action and registration action for changes in OTP
fixed merge conflict