Index: shared/scripts/names.py
===================================================================
diff -u -r76cc0ad1823a2adf10071a84f103772ee71f411f -r06d29555beb8ba4c368040050afe740cb3233d0f
--- shared/scripts/names.py	(.../names.py)	(revision 76cc0ad1823a2adf10071a84f103772ee71f411f)
+++ shared/scripts/names.py	(.../names.py)	(revision 06d29555beb8ba4c368040050afe740cb3233d0f)
@@ -61,13 +61,18 @@
 o_services_screen_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True}
 o_back_btn = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True}
 o_export_logs_text = {"container": o_SettingsBase_SettingsBase, "text": "Export Logs", "type": "Text", "unnamed": 1, "visible": True}
-o_back_btn = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True}
+o_combo_box_base_object={"container": o_SettingsBase_SettingsBase, "id": "_logTypeRow", "type": "Row", "unnamed": 1, "visible": True}
+o_combo_box={"container": o_combo_box_base_object, "id": "_logTypeCombo", "type": "ComboBox", "unnamed": 1, "visible": True}
+o_treatment_comno_box={"checkable": False, "container": o_Overlay, "id": "_logTypeDelegate", "occurrence": 1, "type": "ItemDelegate", "unnamed": 1, "visible": True}
+o_service_combo_box={"checkable": False, "container": o_Overlay, "id": "_logTypeDelegate", "text":"Service", "type": "ItemDelegate", "unnamed": 1, "visible": True}
+o_combo_box_text={"container": o_SettingsBase_SettingsBase, "echoMode": 0, "type": "TextField", "unnamed": 1, "visible": True}
 #SD Card Information
 o_sd_card_text = {"container": o_SettingsBase_SettingsBase, "text": "SD-Card (MB)\nFree : 0.000\nTotal: 0.000", "type": "Label", "unnamed": 1, "visible": True}
 #USB drive Information
 o_usb_text = {"container": o_SettingsBase_SettingsBase, "text": "USB Drive (MB)\nFree : 0.000\nTotal: 0.000", "type": "Label", "unnamed": 1, "visible": True}
+o_export_btns = {"container": o_SettingsBase_SettingsBase,"id": "_logTypeExportButton", "type": "ExportButton", "unnamed": 1, "visible": True}
 #Export button
-o_export_btn = {"container": o_SettingsBase_SettingsBase, "text": "Export", "type": "Text", "unnamed": 1, "visible": True}
+o_export_btn = {"container": o_export_btns, "text": "Export", "type": "Text", "unnamed": 1, "visible": True}
 #object on keyboard to switch to keypad
 o_switch_keyboard_to_keypad = {"container": o_Gui_MainView, "text": "&123", "type": "Text", "unnamed": 1, "visible": True}
 o_keyboard_object = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True}
@@ -82,3 +87,7 @@
 #alarm minimize button
 o_minimize_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iChevronDown", "type": "Image", "unnamed": 1, "visible": True}
 
+
+
+
+
Index: tst_service_screen/test.py
===================================================================
diff -u -r76cc0ad1823a2adf10071a84f103772ee71f411f -r06d29555beb8ba4c368040050afe740cb3233d0f
--- tst_service_screen/test.py	(.../test.py)	(revision 76cc0ad1823a2adf10071a84f103772ee71f411f)
+++ tst_service_screen/test.py	(.../test.py)	(revision 06d29555beb8ba4c368040050afe740cb3233d0f)
@@ -19,7 +19,9 @@
 from dialin.ui.hd_simulator import HDSimulator
 from dialin.common.hd_defs import HDOpModes, HDOpSubModes
 from dialin.ui import utils
+from builtins import str
 
+
 EXPORT_LOGS = "Export Logs"
 
 SERVICE_SCREEN_OPTIONS = ["Information", "Volume And Brightness", "Wi-Fi", "Bluetooth Cuff", "DG Cleaning", "Service", "Export Logs"]
@@ -45,8 +47,7 @@
     test.compare(device_settings_text.text, config.SERIVCES_TITLE, "{} screen is displayed".format(config.SERIVCES_TITLE))
     verify_export_logs_screen()
     mouseClick(waitForObjectExists(names.o_shutdown_btn))
-    test.compare(device_settings_text.text, config.SHUTDOWN_BUTTON_TEXT, "{} screen is displayed".format(config.SHUTDOWN_BUTTON_TEXT))
-    test.compare(device_settings_text.text, config.SERIVCES_TITLE, "{} screen is displayed".format(config.SERIVCES_TITLE))
+    test.compare(waitForObjectExists(names.o_shutdown_btn).text, config.SHUTDOWN_BUTTON_TEXT, "{} screen is displayed".format(config.SHUTDOWN_BUTTON_TEXT))
     test.endSection()
  
 def verify_export_logs_screen():
@@ -64,8 +65,15 @@
 #     mouseClick(waitForObjectExists(names.o_back_btn))
 #     test.compare(services_screen_text_obj.text, config.BACK_BUTTON_TEXT, "{} screen is displayed".format(config.BACK_BUTTON_TEXT))
 #     mouseClick(waitForObjectExists(settings_text_obj(EXPORT_LOGS)))
+    combobox_dropdown = waitForObjectExists(names.o_combo_box )
+    for option in range(3):
+        mouseClick(waitForObjectExists(names.o_combo_box ))
+        test.compare(combobox_dropdown.text.option[0], config.EXPORT_LOGS_OPTIONS[0], "{} combo box is displayed".format(config.EXPORT_LOGS_OPTIONS[0]))
+    mouseClick(waitForObjectExists(names.o_combo_box ))
+    test.compare(waitForObjectExists(names.o_combo_box).text, config.EXPORT_LOGS_OPTIONS, "{} combo box is displayed".format(config.EXPORT_LOGS_OPTIONS))
+    
     mouseClick(waitForObjectExists(names.o_export_btn ))
-    test.compare(services_screen_text_obj.text, config.EXPORT_BUTTON_TEXT , "{} screen is displayed".forma(EXPORT_BUTTON_TEXT))
+    test.compare(waitForObjectExists(names.o_export_btn).text, config.EXPORT_BUTTON_TEXT,"{} screen is displayed".format(config.EXPORT_BUTTON_TEXT))
     test.endSection()