Fix bugs and rearrange code to make sure the payment wall opens on most basic case.
Fix bugs and rearrange code to make sure the payment wall opens on most basic case.

mikaturunen/byop,mikaturunen/byop,mikaturunen/byop