Merge pull request #3001 from wordpress-mobile/contact-info-api-jetpack

Contact Info - Adding Feature Flag + Jetpack API Version Check

bundle/android/strings.xml

@@ -71,7 +71,9 @@
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left" tools:ignore="UnusedResources">Double tap to move the block to the left</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right" tools:ignore="UnusedResources">Double tap to move the block to the right</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_up" tools:ignore="UnusedResources">Double tap to move the block up</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_or_replace_the_image" tools:ignore="UnusedResources">Double tap to open Action Sheet to edit or replace the image</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options" tools:ignore="UnusedResources">Double tap to open Action Sheet with available options</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_or_replace_the_image" tools:ignore="UnusedResources">Double tap to open Bottom Sheet to edit or replace the image</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options" tools:ignore="UnusedResources">Double tap to open Bottom Sheet with available options</string>
     <string name="gutenberg_native_double_tap_to_redo_last_change" tools:ignore="UnusedResources">Double tap to redo last change</string>
     <string name="gutenberg_native_double_tap_to_select" tools:ignore="UnusedResources">Double tap to select</string>
@@ -85,6 +87,7 @@
     <string name="gutenberg_native_double_tap_to_undo_last_change" tools:ignore="UnusedResources">Double tap to undo last change</string>
     <string name="gutenberg_native_duplicate_block" tools:ignore="UnusedResources">Duplicate block</string>
     <string name="gutenberg_native_edit_file" tools:ignore="UnusedResources">Edit file</string>
+    <string name="gutenberg_native_edit_the_cover_image" tools:ignore="UnusedResources">Edit the cover image</string>
     <string name="gutenberg_native_edit_using_web_editor" tools:ignore="UnusedResources">Edit using web editor</string>
     <string name="gutenberg_native_edit_video" tools:ignore="UnusedResources">Edit video</string>
     <string name="gutenberg_native_error" tools:ignore="UnusedResources">Error</string>

bundle/ios/GutenbergNativeTranslations.swift

@@ -63,7 +63,9 @@ private func dummy() {
     _ = NSLocalizedString("Double tap to move the block to the left", comment: "")
     _ = NSLocalizedString("Double tap to move the block to the right", comment: "")
     _ = NSLocalizedString("Double tap to move the block up", comment: "")
+    _ = NSLocalizedString("Double tap to open Action Sheet to edit or replace the image", comment: "")
     _ = NSLocalizedString("Double tap to open Action Sheet with available options", comment: "")
+    _ = NSLocalizedString("Double tap to open Bottom Sheet to edit or replace the image", comment: "")
     _ = NSLocalizedString("Double tap to open Bottom Sheet with available options", comment: "")
     _ = NSLocalizedString("Double tap to redo last change", comment: "")
     _ = NSLocalizedString("Double tap to select", comment: "")
@@ -75,6 +77,7 @@ private func dummy() {
     _ = NSLocalizedString("Double tap to undo last change", comment: "")
     _ = NSLocalizedString("Duplicate block", comment: "")
     _ = NSLocalizedString("Edit file", comment: "")
+    _ = NSLocalizedString("Edit the cover image", comment: "")
     _ = NSLocalizedString("Edit using web editor", comment: "")
     _ = NSLocalizedString("Edit video", comment: "")
     _ = NSLocalizedString("Error", comment: "")

src/jetpack-editor-setup.js

@@ -44,6 +44,14 @@ export default ( jetpackState ) => {
 
 	const jetpackData = setJetpackData( jetpackState );
 
+	const toggleBlock = ( capability, blockName ) => {
+		if ( capability !== true ) {
+			dispatch( 'core/edit-post' ).hideBlockTypes( [ blockName ] );
+		} else {
+			dispatch( 'core/edit-post' ).showBlockTypes( [ blockName ] );
+		}
+	};
+
 	// Note on the use of setTimeout() here:
 	// We observed the settings may not be ready exactly when the native.render hooks get run but rather
 	// right after that execution cycle (because state hasn't changed yet). Hence, we're only checking for
@@ -53,15 +61,12 @@ export default ( jetpackState ) => {
 
 	// eslint-disable-next-line @wordpress/react-no-unsafe-timeout
 	setTimeout( () => {
-		const mediaFilesCollectionBlock = select(
-			'core/block-editor'
-		).getSettings( 'capabilities' ).mediaFilesCollectionBlock;
+		const capabilities = select( 'core/block-editor' ).getSettings(
+			'capabilities'
+		);
 
-		if ( mediaFilesCollectionBlock !== true ) {
-			dispatch( 'core/edit-post' ).hideBlockTypes( [ 'jetpack/story' ] );
-		} else {
-			dispatch( 'core/edit-post' ).showBlockTypes( [ 'jetpack/story' ] );
-		}
+		toggleBlock( capabilities.mediaFilesCollectionBlock, 'jetpack/story' );
+		toggleBlock( capabilities.contactInfoBlock, 'jetpack/contact-info' );
 	} );
 
 	require( '../jetpack/projects/plugins/jetpack/extensions/editor' );