add fix iap prompt
add fix iap prompt
fix text bug and board reset
fix text bug and board reset
fix text bug for 7.1
fix text bug for 7.1
fix time tracker
merge