refactoring

@@ -216,14 +216,7 @@ Resource                                                        playtender_contr
     open tender form by uaid                                    ${tender_uaid}
     wait until page does not contain element with reloading     ${tender_sync_element_locator}
     ${tender_form_lots_remove_item_btn_locator} =               replace string  ${tender_form_lots_remove_item_btn_locator_tpl}  %item_id%  ${item_id}
-    wait until page contains element with reloading             ${tender_form_lots_remove_item_btn_locator}
-    click visible element                                       ${tender_form_lots_remove_item_btn_locator}
-    Wait Until Page Contains                                    ${tender_lots_remove_item_form_submit_success_msg}  60
-    execute javascript                                          ${not_alert_opened_close_btn_locator}
-    #run keyword and ignore error  click visible element                                       ${not_alert_opened_close_btn_locator}
-    capture page screenshot
-    Wait Until Page Does Not Contain                            ${tender_lots_remove_item_form_submit_success_msg}  10
-    capture page screenshot
+    click removing form item and wait success result            ${tender_form_lots_remove_item_btn_locator}
 
     save tender form and wait synchronization
 
@@ -281,12 +274,8 @@ Resource                                                        playtender_contr
     [Documentation]                                             Додати предмет item в лот з lot_id в описі для тендера tender_uaid.
 
     open tender form by uaid                                    ${tender_uaid}
-#    click visible element                                       ${tender_form_lots_add_item_btn_locator}
     ${items} =                                                  create list  ${item}
     fill tender form items                                      ${items}
-#    wait until popup is visible
-#    fill tender item form in opened popup                                      ${item}
-#    submit current visible popup
     save tender form and wait synchronization
 
 
@@ -704,7 +693,6 @@ Resource                                                        playtender_contr
 
     open tender page by uaid                                    ${tender_uaid}
     open tender form qualification                              ${award_num}
-#    wait until popup is visible
     cancel award qualification
 
 Затвердити постачальників
@@ -775,7 +763,6 @@ Resource                                                        playtender_contr
 
     open tender page by uaid                                    ${tender_uaid}
     open tender form prequalification                           ${qualification_num}
-#    wait until popup is visible
     cancel qualifications
 
 Затвердити остаточне рішення кваліфікації

@@ -66,12 +66,19 @@ cancel qualifications
 approve the final qualification decision
     [Documentation]                                             Перевести тендер tender_uaid в статус active.pre-qualification.stand-still.
 
-    wait until page contains                                    ${qualification_form_approve_question_msg}
-    Execute Javascript  ${qualification_form_approve_js_submit_btn_locator}
-    Wait Until Page Contains                                    ${qualification_form_approve_success_msg}  60
+    wait until alert is visible                                 ${qualification_form_approve_question_msg}
+    click visible element                                       ${alert_confirm_btn_locator}
     wait until alert is visible                                 ${qualification_form_approve_success_msg}
-    run keyword and ignore error                                run keyword if condition is not none  ${qualification_form_approve_success_msg}  close current visible alert
-    Wait Until Keyword Succeeds                                 1600 s    20 s    Wait For QualificationsPeriodEnd
+    close current visible alert
+
+    wait until page does not contain element                    ${alert_confirm_btn_locator}
+
+#    wait until page contains                                    ${qualification_form_approve_question_msg}
+#    Execute Javascript  ${qualification_form_approve_js_submit_btn_locator}
+#    Wait Until Page Contains                                    ${qualification_form_approve_success_msg}  60
+#    wait until alert is visible                                 ${qualification_form_approve_success_msg}
+#    run keyword and ignore error                                run keyword if condition is not none  ${qualification_form_approve_success_msg}  close current visible alert
+    run keyword and ignore error                                Wait Until Keyword Succeeds                                 1600 s    20 s    Wait For QualificationsPeriodEnd
 
 #qualification
 open tender form qualification