Merge pull request #19631 from wordpress-mobile/release/23.7

Merge 23.7 code freeze to trunk

Author: oguzkocer

RELEASE-NOTES.txt

@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+23.8
+-----
+
+
 23.7
 -----
 * [***] [Jetpack-only] Added the All Domains screen enabling the users to manage their domains from within the app [https://github.com/wordpress-mobile/WordPress-Android/pull/19599]

WordPress/jetpack_metadata/release_notes.txt

@@ -1,4 +1,6 @@
-- New domain/plan options and checkout screens in site creation process
-- My Site navigation has links to common sections
-- Inactive social icons and Synced Pattern titles are visible in dark mode for block-based themes
-- Content can be converted into blocks in the Classic editor
+* [***] [Jetpack-only] Added the All Domains screen enabling the users to manage their domains from within the app [https://github.com/wordpress-mobile/WordPress-Android/pull/19599]
+* [*] Block Editor: Fix error when pasting deeply nested structure content [https://github.com/WordPress/gutenberg/pull/55613]
+* [*] Block Editor: Fix crash related to accessing undefined value in `TextColorEdit` [https://github.com/WordPress/gutenberg/pull/55664]
+* [**] Posts & Pages: Redesigned the posts and pages screen. We’ve consolidated the “default” and “compact” display options [https://github.com/wordpress-mobile/WordPress-Android/issues/19341] &  [https://github.com/wordpress-mobile/WordPress-Android/issues/19348]
+* [*] Posts & Pages: Moved actions to a context menu and added new actions such as “comment”, “settings”  [https://github.com/wordpress-mobile/WordPress-Android/issues/19343] & [https://github.com/wordpress-mobile/WordPress-Android/issues/19356]
+

WordPress/metadata/release_notes.txt

@@ -1,2 +1,5 @@
-- Inactive social icons and Synced Pattern titles are no longer invisible in block-based themes using dark mode. Good try, fellas, but you’re not as ninja as you think.
-- In the Classic editor, you can now convert your content into blocks with the click of a button.
+* [*] Block Editor: Fix error when pasting deeply nested structure content [https://github.com/WordPress/gutenberg/pull/55613]
+* [*] Block Editor: Fix crash related to accessing undefined value in `TextColorEdit` [https://github.com/WordPress/gutenberg/pull/55664]
+* [**] Posts & Pages: Redesigned the posts and pages screen. We’ve consolidated the “default” and “compact” display options [https://github.com/wordpress-mobile/WordPress-Android/issues/19341] &  [https://github.com/wordpress-mobile/WordPress-Android/issues/19348]
+* [*] Posts & Pages: Moved actions to a context menu and added new actions such as “comment”, “settings”  [https://github.com/wordpress-mobile/WordPress-Android/issues/19343] & [https://github.com/wordpress-mobile/WordPress-Android/issues/19356]
+

WordPress/src/main/res/values/strings.xml

@@ -3016,7 +3016,7 @@
     <string name="get_started" tools:ignore="UnusedResources" a8c-src-lib="login">Get Started</string>
     <string name="next">Next</string>
     <string name="check_email" tools:ignore="UnusedResources" a8c-src-lib="login">Check email</string>
-    <string name="enter_verification_code" tools:ignore="UnusedResources" a8c-src-lib="login">Almost there! Please enter the verification code from your Authenticator app.</string>
+    <string name="enter_verification_code" tools:ignore="UnusedResources" a8c-src-lib="login">Almost there! Please enter the verification code for WordPress.com from your authenticator app.</string>
     <string name="enter_verification_code_sms" tools:ignore="UnusedResources" a8c-src-lib="login">We sent a text message to the phone number ending in %s. Please enter the verification code in the SMS.</string>
     <string name="login_text_otp" tools:ignore="UnusedResources" a8c-src-lib="login">Text me a code instead</string>
     <string name="login_text_otp_another" tools:ignore="UnusedResources" a8c-src-lib="login">Text me another code instead</string>
@@ -4797,4 +4797,7 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
     <string name="account_and_settings">Account and Settings</string>
     <string name="gutenberg_native_alternatively_you_can_convert_the_content_to_blocks" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Alternatively, you can convert the content to blocks.</string>
     <string name="gutenberg_native_s_block_converted_to_blocks" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">\'%s\' block converted to blocks</string>
+    <string name="login_text_security_key" tools:ignore="UnusedResources" a8c-src-lib="login">Use a security key</string>
+    <string name="login_error_security_key" tools:ignore="UnusedResources" a8c-src-lib="login">There was some trouble with the Security key login</string>
+    <string name="notification_security_key_needed" tools:ignore="UnusedResources" a8c-src-lib="login">Please provide your security key to continue.</string>
 </resources>

build.gradle

@@ -22,8 +22,8 @@ ext {
     automatticTracksVersion = '3.3.0'
     gutenbergMobileVersion = 'v1.108.0'
     wordPressAztecVersion = 'v1.8.0'
-    wordPressFluxCVersion = 'trunk-da7285ca3e37af05b86442347a55bfb561838988'
-    wordPressLoginVersion = 'trunk-e5db5c9a6264163d45322a6c516ae60e0c87481e'
+    wordPressFluxCVersion = '2.55.0'
+    wordPressLoginVersion = '1.8.0'
     wordPressPersistentEditTextVersion = '1.0.2'
     wordPressUtilsVersion = '3.10.0'
     indexosMediaForMobileVersion = '43a9026f0973a2f0a74fa813132f6a16f7499c3a'

fastlane/resources/values/strings.xml

@@ -280,6 +280,7 @@
     <string name="multiple_status_label_delimiter" translatable="false">\u0020·\u0020</string>
     <string name="post_list_toggle_item_layout_cards_view">Switch to cards view</string>
     <string name="post_list_toggle_item_layout_list_view">Switch to list view</string>
+    <string name="post_list_toggle_author_filter">Filter by author</string>
     <string name="post_waiting_for_connection_publish">We\'ll publish the post when your device is back online.</string>
     <string name="post_waiting_for_connection_pending">We\'ll submit your post for review when your device is back online.</string>
     <string name="post_waiting_for_connection_scheduled">We\'ll schedule your post when your device is back online.</string>
@@ -308,6 +309,8 @@
     <string name="button_copy">Duplicate</string>
     <string name="button_copy_link">Copy link</string>
     <string name="button_promote_with_blaze">Promote with Blaze</string>
+    <string name="button_comments" translatable="false">@string/comments</string>
+    <string name="button_share" translatable="false">@string/share_desc</string>
 
     <!-- post uploads -->
     <string name="upload_failed_param">Upload failed for \"%s\"</string>
@@ -1759,6 +1762,7 @@
     <string name="post_status_post_scheduled">Scheduled</string>
     <string name="post_status_post_trashed">Trashed</string>
     <string name="post_status_post_published">Published</string>
+    <string name="post_status_post_edited">Edited</string>
 
     <string-array name="post_settings_statuses" translatable="false">
         <item>@string/post_status_publish_post</item>
@@ -2395,6 +2399,7 @@
     <string name="my_site_blogging_prompt_card_menu_skip">Skip for today</string>
     <string name="my_site_blogging_prompt_card_menu_remove">Turn off prompts</string>
     <string name="my_site_blogging_prompt_card_attribution_dayone">From &lt;b&gt;DayOne&lt;/b&gt;</string>
+    <string name="my_site_blogging_prompt_card_attribution_bloganuary">From &lt;b&gt;Bloganuary&lt;/b&gt;</string>
     <string name="my_site_blogging_prompt_card_menu_learn_more">Learn more</string>
     <string name="my_site_blogging_prompt_card_skipped_snackbar">Skipped today\'s blogging prompt</string>
     <string name="my_site_blogging_prompt_card_removed_snackbar_title">Blogging Prompts hidden</string>
@@ -2651,6 +2656,7 @@
 
     <!-- Domain Registration -->
     <string name="domains_title">Domains</string>
+    <string name="site_domain_title">Site Domain</string>
     <string name="register_domain">Register Domain</string>
     <string name="domains_suggestions_select_domain">Select domain</string>
     <string name="domains_suggestions_empty_list">No suggestions found</string>
@@ -2706,15 +2712,16 @@
 
     <!-- Domain Management -->
     <string name="domain_management_expires">Expires %1$s</string>
-    <string name="domain_management_my_domains_title">My Domains</string>
+    <string name="domain_management_my_domains_title">All Domains</string>
     <string name="domain_management_purchase_a_domain">Purchase a domain</string>
     <string name="domain_management_search_your_domains">Search your domains</string>
     <string name="domain_management_open_domain_details">Open domain details</string>
-    <string name="domain_management_error_title">Couldn\'t Update</string>
-    <string name="domain_management_error_subtitle">Check that you\'re online and refresh.</string>
+    <string name="domain_management_error_title">Couldn\'t retrieve your domains</string>
+    <string name="domain_management_error_subtitle">Check that you\'re online and pull to refresh.</string>
     <string name="domain_management_empty_title">You don\'t have any domains</string>
     <string name="domain_management_empty_subtitle">Tap below to find your perfect domain.</string>
     <string name="domain_management_empty_find_domain">Find a domain</string>
+    <string name="domain_management_site_domains_button">All</string>
 
     <!-- Domain Management - Purchase Domain Screen -->
     <string name="purchase_domain_screen_title">Purchase Domain</string>
@@ -2728,6 +2735,18 @@
     <string name="purchase_domain_screen_existing_domain_card_description">Use with a site you already started.</string>
     <string name="purchase_domain_screen_existing_domain_card_button">Choose Site</string>
     <string name="purchase_domain_screen_discount_notice">*A free domain for one year is included with all paid annual plans.</string>
+    <string name="purchase_domain_screen_error_title">Error</string>
+    <string name="purchase_domain_screen_error_subtitle">Something went wrong while adding the domain to the cart. Make sure you are online and retry.</string>
+    <string name="purchase_domain_screen_error_button_title">OK</string>
+
+    <!-- Domain Management - Search For A New Domain Screen -->
+    <string name="new_domain_search_screen_title">Search for a domain</string>
+    <string name="new_domain_search_screen_input_placeholder">Type to get more suggestions</string>
+    <string name="new_domain_search_screen_transfer_domain_description">Looking to transfer a domain you already own?</string>
+    <string name="new_domain_search_screen_transfer_domain_button">Transfer domain</string>
+    <string name="new_domain_search_screen_list_item_regular_price">%s / year</string>
+    <string name="new_domain_search_screen_list_item_sale_price">%s for the first year</string>
+    <string name="new_domain_search_screen_error_title">Couldn\'t retrieve domains</string>
 
     <!-- Automated Transfer Eligibility Errors -->
     <string name="plugin_install_site_ineligible_default_error">If you just registered a domain name, please wait until we finish setting it up and try again.\n\nIf not, looks like something went wrong and plugin feature might not be available for this site.</string>
@@ -2997,7 +3016,7 @@
     <string name="get_started" tools:ignore="UnusedResources" a8c-src-lib="login">Get Started</string>
     <string name="next">Next</string>
     <string name="check_email" tools:ignore="UnusedResources" a8c-src-lib="login">Check email</string>
-    <string name="enter_verification_code" tools:ignore="UnusedResources" a8c-src-lib="login">Almost there! Please enter the verification code from your Authenticator app.</string>
+    <string name="enter_verification_code" tools:ignore="UnusedResources" a8c-src-lib="login">Almost there! Please enter the verification code for WordPress.com from your authenticator app.</string>
     <string name="enter_verification_code_sms" tools:ignore="UnusedResources" a8c-src-lib="login">We sent a text message to the phone number ending in %s. Please enter the verification code in the SMS.</string>
     <string name="login_text_otp" tools:ignore="UnusedResources" a8c-src-lib="login">Text me a code instead</string>
     <string name="login_text_otp_another" tools:ignore="UnusedResources" a8c-src-lib="login">Text me another code instead</string>
@@ -3332,6 +3351,7 @@
     <string name="pages_item_date_subtitle">%1$s ·</string>
     <string name="pages_item_date_author">%1$s · %2$s</string>
     <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_subtitle">%1$s ·</string>
     <string name="pages_copy_link">Copy link</string>
 
     <string name="page_status_pending_review" translatable="false">@string/post_status_pending_review</string>
@@ -4777,4 +4797,7 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
     <string name="account_and_settings">Account and Settings</string>
     <string name="gutenberg_native_alternatively_you_can_convert_the_content_to_blocks" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Alternatively, you can convert the content to blocks.</string>
     <string name="gutenberg_native_s_block_converted_to_blocks" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">\'%s\' block converted to blocks</string>
+    <string name="login_text_security_key" tools:ignore="UnusedResources" a8c-src-lib="login">Use a security key</string>
+    <string name="login_error_security_key" tools:ignore="UnusedResources" a8c-src-lib="login">There was some trouble with the Security key login</string>
+    <string name="notification_security_key_needed" tools:ignore="UnusedResources" a8c-src-lib="login">Please provide your security key to continue.</string>
 </resources>

version.properties

@@ -1,2 +1,2 @@
-versionName=23.6
-versionCode=1382
+versionName=23.7-rc-1
+versionCode=1383