fix(billing): a user can add payment while upgrading their plan

fix(billing): a user can add payment while upgrading their plan #7264