fixed issue at cancellation of scheduled offer
rebase with master
fixed issue with number-input