Add\move testIDs in Dialog\Modal to support detox 17 (#892)

Author: M-i-k-e-l

src/components/dialog/index.js

@@ -224,11 +224,12 @@ class Dialog extends BaseComponent {
 
   render = () => {
     const {orientationKey, modalVisibility} = this.state;
-    const {supportedOrientations, accessibilityLabel} = this.getThemeProps();
+    const {testID, supportedOrientations, accessibilityLabel} = this.getThemeProps();
 
     return (
       <Modal
         key={orientationKey}
+        testID={`${testID}.modal`}
         transparent
         visible={modalVisibility}
         animationType={'none'}

src/components/modal/index.js

@@ -52,9 +52,8 @@ export default class Modal extends BaseComponent {
         <View
           useSafeArea={isScreenReaderEnabled}
           style={!isScreenReaderEnabled && [styles.touchableOverlay, {backgroundColor: overlayBackgroundColor}]}
-          testID={testID}
         >
-          <TouchableWithoutFeedback {...accessibilityProps} onPress={onBackgroundPress}>
+          <TouchableWithoutFeedback {...accessibilityProps} onPress={onBackgroundPress} testID={testID}>
             <View style={isScreenReaderEnabled ? styles.accessibleOverlayView : styles.overlayView}/>
           </TouchableWithoutFeedback>
         </View>