-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Domain Purchase] Update final UI strings #20614
Conversation
📲 You can test the changes from this Pull Request in WordPress Alpha by scanning the QR code below to install the corresponding build.
|
📲 You can test the changes from this Pull Request in Jetpack Alpha by scanning the QR code below to install the corresponding build.
|
if let isFreeDomain = isFreeDomain { | ||
return isFreeDomain | ||
} | ||
return siteCreator.shouldShowDomainCheckout |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I want to point out that this logic shows the "Paid" copy for free domains. I think you meant this:
if let isFreeDomain = isFreeDomain {
return !isFreeDomain
}
Also, if isFreeDomain
is not optional and false
, the shouldShowDomainPurchase
will be true
without taking into consideration the feature flag and AB test conditions in siteCreator.shouldShowDomainCheckout
. To fix that, I think we can do the following:
if isFreeDomain == true {
return false
}
This code means to return shouldShowDomainPurchase == false
only if the domain is free. But if it's paid, the siteCreator.shouldShowDomainCheckout
should be executed instead.
@@ -141,8 +135,12 @@ final class SiteAssemblyContentView: UIView { | |||
|
|||
let siteCreator: SiteCreator | |||
|
|||
var isFreeDomain: Bool? | |||
private lazy var shouldShowDomainPurchase: Bool = { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: perhaps we should add some space between isFreeDomain
and shouldShowDomainPurchase
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! 🚀
commit 22c7f92981801a0254af4201ae3c7d2aa4d84938 Merge: e9c753c99d 87b70b10eb Author: Annmarie <annmarie.ziegler@gmail.com> Date: Thu May 4 15:38:20 2023 -0400 Merge pull request #20637 from wordpress-mobile/issue/dashboard-cards-release-notes Dashboard Cards: Add internal release notes Activity Log and Pages commit 87b70b10eb4b8a14921a11f31b7a43a4654c1e18 Author: Annmarie Ziegler <annmarie.ziegler@gmail.com> Date: Thu May 4 11:07:50 2023 -0400 Add internal release notes for new pages and activity log dashboard cards commit e9c753c99dea4eaaef854455fffb7c00c2a386ac Merge: 88e8e7c518 676e103d50 Author: Gio Lodi <gio.lodi@automattic.com> Date: Thu May 4 22:10:11 2023 +1000 Merge 22.3.0.1 with editorialized release notes (#20634) commit 676e103d5060de1a9345e64154a7f19ea7becc09 Author: Gio Lodi <gio@mokacoding.com> Date: Thu May 4 14:11:27 2023 +1000 Update metadata strings commit 1f1f1d0559c5bb3198521b40a52589cf6ff78aec Author: Gio Lodi <gio@mokacoding.com> Date: Thu May 4 14:11:22 2023 +1000 Update metadata strings commit 73e80e2c40675e3b26fdbf6a1630d18ffb643339 Author: Gio Lodi <gio@mokacoding.com> Date: Thu May 4 14:10:57 2023 +1000 Add editorialized release notes for Jetpack 22.3 commit f1772c3f233ca4e9aab6eb3a7dc5cc137a7aa698 Author: Gio Lodi <gio@mokacoding.com> Date: Thu May 4 14:10:26 2023 +1000 Add editorialized release notes for WordPress 22.3 commit 88e8e7c51884876323a9bc883162baa89ba241e3 Author: Paul Von Schrottky <paul.von.schrottky@automattic.com> Date: Wed May 3 12:36:25 2023 -0400 Add UI testing tips to docs (#20576) * Move UI testing checklist to existing docs The proposal moves the newly added UI testing checklist to the existing `docs` folder and turns them into testing considerations. These considerations are roughly split between various existing docs: accessibility, localization, pull requests, RTL language support. * Added link to PR guideline from PR template * Revert changes to PR template --------- Co-authored-by: Paul Von Schrottky <paulvonschrottky@Pauls-MacBook-Pro-2.local> commit 535b32700bca2b06ccf7ec902edc343792943d23 Author: Gio Lodi <gio@mokacoding.com> Date: Tue May 2 20:11:41 2023 +1000 Bump version number commit 0d4dd56b0772877979f5787816bc61e1be2597d2 Author: Gio Lodi <gio@mokacoding.com> Date: Tue May 2 20:11:27 2023 +1000 Update Jetpack metadata translations commit 0683f78e3e536a21f8973621693d92e6ffc28a23 Author: Gio Lodi <gio@mokacoding.com> Date: Tue May 2 20:11:19 2023 +1000 Update WordPress metadata translations commit 7b46500ace828c70ff890c7f5f2e99060f6ee3c1 Author: Gio Lodi <gio@mokacoding.com> Date: Tue May 2 20:10:55 2023 +1000 Update app translations – `Localizable.strings` commit 01675837cf1149d0db72c05cc7838f4ecb650144 Merge: 1c8fa0e628 c91b8a8d56 Author: Gio Lodi <gio.lodi@automattic.com> Date: Tue May 2 20:07:13 2023 +1000 Add support for ExPlat in the Jetpack app via workaround (#20607) commit 1c8fa0e6286350777478056ea18e288abf32fef3 Merge: c0771b852d 8318bd36d1 Author: Matthew Kevins <mkevins@users.noreply.github.com> Date: Tue May 2 14:52:22 2023 +1000 Merge pull request #20613 from wordpress-mobile/task/domain-purchasing-assembly-step-error-handling Improve site creation error handling in the site assembly step commit c91b8a8d56de3d56fc08e1a6cfba47439e12cbfe Author: Gio Lodi <gio@mokacoding.com> Date: Tue May 2 13:50:06 2023 +1000 Use Tracks version 2.2.0 This version includes the changes from https://github.com/Automattic/Automattic-Tracks-iOS/pull/253 which are required by the work on this branch commit 41dc00722ae4f53db71fac5385015d23011c2e8a Merge: 74f92c587c 89da27807b Author: Gio Lodi <gio.lodi@automattic.com> Date: Tue May 2 13:18:06 2023 +1000 Add A/B test experiment for domain purchasing (#20590) commit 89da27807bd4f372e155e58080a9cd67e97d342d Author: Salim Braksa <salim.braksa@gmail.com> Date: Thu Apr 27 04:08:10 2023 +0100 Add explicit self in closure commit a58884f78e3528a3a9376b83082ba42ac89ae50d Author: Salim Braksa <salim.braksa@gmail.com> Date: Wed Apr 26 20:24:48 2023 +0100 Refactor domainPurchasingExperiment event tracking to take into ExPlat changes commit c4b3cc937f4a393469a2cca22cf530fb75502931 Author: Salim Braksa <salim.braksa@gmail.com> Date: Mon Apr 24 15:01:53 2023 +0100 Add missing documentation commit 28bcde47d450ddf4a80e2ed358ef9454f882a0c6 Author: Salim Braksa <salim.braksa@gmail.com> Date: Mon Apr 24 14:33:27 2023 +0100 Add domainPurchasingExperiment track event commit 0c5566b887ce1ece8e425bacdd765a6ce3f703b5 Author: Salim Braksa <salim.braksa@gmail.com> Date: Mon Apr 24 14:13:59 2023 +0100 Refactor enhancedSiteCreationAccessed event tracking to SiteCreationAnalyticsHelper commit 7c227dc7a4fd5f42c3000cdda2386227c8f5f350 Author: Salim Braksa <salim.braksa@gmail.com> Date: Mon Apr 24 13:44:07 2023 +0100 Update is domain purchasing enabled logic to include the AB experiment commit fef2d0efad8fd949371a1c950b4c82736b3586cb Author: Salim Braksa <salim.braksa@gmail.com> Date: Mon Apr 24 12:45:24 2023 +0100 Add siteCreationDomainPurchasing case to ABTest enum commit 4466ad4d93d6872fd6ecf492fef433b264f608d7 Author: Salim Braksa <salim.braksa@gmail.com> Date: Mon Apr 24 12:44:56 2023 +0100 Refactor ABTest enum to enable experiments for Jetpack only commit 8318bd36d19797c4c83202c710b67a69b3c4846a Author: Salim Braksa <salim.braksa@gmail.com> Date: Thu Apr 27 00:32:39 2023 +0100 Resolve an issue that was causing multiple error state views to be displayed commit bf6fc4b7bdf191d2dde98eaa1ae95ce3b618b2ce Author: Salim Braksa <salim.braksa@gmail.com> Date: Thu Apr 27 00:30:16 2023 +0100 Fix contact support was not displaying commit 238e0a4006749434ce1d474fb2b2118118a44be8 Author: Salim Braksa <salim.braksa@gmail.com> Date: Thu Apr 27 00:29:58 2023 +0100 Move to progress state when retrying domain purchasing commit 2dfea2266dadba4ed36158a75d45768e918a6c83 Author: Salim Braksa <salim.braksa@gmail.com> Date: Thu Apr 27 00:12:12 2023 +0100 Add ability to retry domain checkout if it fails commit d5c08b38de26505cbf3b3da9bc35cf7c59f38855 Author: Salim Braksa <salim.braksa@gmail.com> Date: Wed Apr 26 23:45:30 2023 +0100 Show error message when domain checkout fails commit 2df7bb151badc14a80002de1851a46c11d152692 Author: Salim Braksa <salim.braksa@gmail.com> Date: Wed Apr 26 23:45:06 2023 +0100 Add localized strings for domain checkout failure commit 74f92c587c22e19c58439d2981e118d5cc1a64b0 Author: Salim Braksa <salim.braksa@gmail.com> Date: Tue May 2 01:28:51 2023 +0100 Podfile.lock update due to pod install commit 450c777cf959d0d1e2d4b030c5eb4fa51281cf14 Author: Salim Braksa <salim.braksa@gmail.com> Date: Tue May 2 01:24:45 2023 +0100 Remove Sentry pod regex logic and explicity list the Sentry pods to install dynamically commit 708479046a1a09443d5229bf1634744f3fe84490 Author: Salim Braksa <salim.braksa@gmail.com> Date: Tue Apr 25 23:02:10 2023 +0100 Set TracksService.platform property to wpios for WordPress and Jetpack commit bffae92092aa83b03dcdb32563f042585bd04b3a Author: Salim Braksa <salim.braksa@gmail.com> Date: Tue Apr 25 23:01:38 2023 +0100 Handle a compilation error due to updating Automattic-Tracks-iOS pod update commit 951f6d1f318c8c5083a5e5a3c2a46d1fd9310a07 Author: Salim Braksa <salim.braksa@gmail.com> Date: Tue Apr 25 23:00:44 2023 +0100 Update Automattic-Tracks-iOS version commit 19f77f363dc62aa30b1af1db8217c380544a02b6 Merge: 76b7203da4 c0771b852d Author: Gio Lodi <gio.lodi@automattic.com> Date: Mon May 1 13:02:02 2023 +1000 Merge 22.3 code freeze (#20626) commit c0771b852dd9f6d9eb2177de734db5d27729bbf3 Author: Gio Lodi <gio@mokacoding.com> Date: Mon May 1 11:56:44 2023 +1000 Update strings for localization commit 2d43205ecec8bda67f9756de21dfbf6449abd542 Author: Gio Lodi <gio@mokacoding.com> Date: Mon May 1 11:52:46 2023 +1000 Use latest versions of internal pods for version 22.3 This was done via: ``` bundle exec pod update \ WordPressKit \ WordPressAuthenticator \ WordPressShared ``` commit 3c0a6255ef65fdd9073a91ae831371eac107d94d Author: Gio Lodi <gio@mokacoding.com> Date: Mon May 1 11:49:49 2023 +1000 Release Notes: add new section for next version (22.4) commit 593e3a17800a5073ff1bb2d3886cd6c30299cf01 Author: Gio Lodi <gio@mokacoding.com> Date: Mon May 1 11:49:49 2023 +1000 Update draft release notes for 22.3. commit e41bdbf73abf466333ccd105d740e21de1440881 Author: Gio Lodi <gio@mokacoding.com> Date: Mon May 1 11:49:48 2023 +1000 Update draft release notes for 22.3. commit 5f15a1ffba4acd8f9687243dcb2f7c4697cdf6b7 Author: Gio Lodi <gio@mokacoding.com> Date: Mon May 1 11:49:44 2023 +1000 Bump version number commit 76b7203da4f5b17a64cb3d542beb39b41d8f7bf3 Merge: 1199bfbf48 2b1c322c45 Author: Gio Lodi <gio.lodi@automattic.com> Date: Sun Apr 30 21:03:57 2023 +1000 Update comments styling to match app colors (#20579) commit 1199bfbf48dd5889af98a6e659ada9aa960db190 Merge: 118f56ff7b 88e1bd8b63 Author: Paul Von Schrottky <paul.von.schrottky@automattic.com> Date: Fri Apr 28 17:46:19 2023 -0400 Merge pull request #20621 from wordpress-mobile/task/20620-dont-show-domains-dashboard-card-while-domains-still-loading Fix Domain Dashboard Card appearing while domains information is still loading commit 88e1bd8b63ef35f9fa1735ccaabebdb7bd98e782 Author: Paul Von Schrottky <paul.von.schrottky@automattic.com> Date: Fri Apr 28 17:02:26 2023 -0400 Update WordPress/WordPressTest/Dashboard/DomainsDashboardCardHelperTests.swift commit 118f56ff7beebad873fcddc94d287177832a777e Merge: 4195dd9f2d 4019900e60 Author: Gio Lodi <gio.lodi@automattic.com> Date: Sat Apr 29 04:40:37 2023 +1000 Merge finalized release 22.2 (#20619) commit 4195dd9f2d1b94670c70fd8599f08e6cd3796b98 Merge: ffc683c5b1 b898eabd38 Author: Alp Avanoglu <alp.avanoglu@automattic.com> Date: Fri Apr 28 20:29:56 2023 +0200 Merge pull request #20614 from wordpress-mobile/task/domain-purchase-final-ui-strings-v2 [Domain Purchase] Update final UI strings commit b898eabd3844d1a52a9f5431d60631b58c954b27 Author: alpavanoglu <alp.avanoglu@automattic.com> Date: Fri Apr 28 16:20:32 2023 +0200 Update `shouldShowDomainPurchase` lazy var as a function commit 183dca868390116a4bca0e9ee3847fefd8b27c67 Author: alpavanoglu <alp.avanoglu@automattic.com> Date: Fri Apr 28 14:07:12 2023 +0200 Fix `shouldShowDomainPurchase` logic commit 685b213cb3c638afa711866145d19dd2cb98311b Author: alpavanoglu <alp.avanoglu@automattic.com> Date: Fri Apr 28 12:57:02 2023 +0200 Update free vs paid domain logic commit db4de22d71cc01fa049ab0894ca3303d86fe07bb Author: Povilas Staskus <povilas.staskus@automattic.com> Date: Fri Apr 28 13:21:02 2023 +0300 Sync site metadata when the site is switched If the account has multiple sites, we don't fully sync site metadata for non-default sites until "pull to refresh", app reload, or switching between home and menu segments. commit 85335ab2f3fb722ff3875cbae306609583c84176 Author: Povilas Staskus <povilas.staskus@automattic.com> Date: Fri Apr 28 11:44:39 2023 +0300 Do not display domains dashboard card if domains information is not loaded - Avoid displaying domains dashboard card for the sites that have domains but we haven't yet loaded domains information - blog.freeDomain can be used as a flag, since it should contain a wpCom subdomain if the domains are loaded commit ffc683c5b1b66b09ab0f4cbb0dccff2334680900 Merge: 17e50455a6 c9c18a55fb Author: Carlos Garcia <fluiddot@gmail.com> Date: Fri Apr 28 09:35:32 2023 +0200 Merge pull request #20606 from wordpress-mobile/update-media-specific-fields Allow updating specific fields when updating media details commit 17e50455a67bceb744ba4d8c472424bb0d1d84c5 Author: Povilas Staskus <povilas.staskus@automattic.com> Date: Fri Apr 28 09:43:48 2023 +0300 Domains: Use a common criterion for supporting domain purchases (#20612) * Use blog.supports(.domains) in DomainsDashboardCardHelper - Expand blog.supports(.domains) to have a consistent definition across the app - Reuse it in DomainsDashboardCardHelper * Move DomainsDashboardCardHelperTests to BlogTests commit 4019900e60b9cd72315bd56a14476d9cf5551487 Merge: 0f54018f52 1fa78505bb Author: Gio Lodi <gio@mokacoding.com> Date: Fri Apr 28 13:44:39 2023 +1000 Merge branch 'origin/trunk' into merge/release-22.2-into-trunk There were conflicts on `Podfile` and `Podfile.lock` because both branches changed the Gutenberg version. As usual, I resolved them with `git checkout --theirs`, keeping the value from `trunk` because it is a later stable version. commit 0f54018f52c54fc491dd129a4b9732ce8af3ea6f Author: Gio Lodi <gio@mokacoding.com> Date: Fri Apr 28 13:19:11 2023 +1000 Bump version number commit e6749b2eb5c283e77f38a9695bead0eab06a7318 Author: Gio Lodi <gio@mokacoding.com> Date: Fri Apr 28 13:18:56 2023 +1000 Update Jetpack metadata translations commit abb70e200ef22b150e8a8a6a50d00bc6b679b8c5 Author: Gio Lodi <gio@mokacoding.com> Date: Fri Apr 28 13:18:50 2023 +1000 Update WordPress metadata translations commit ccf8e3467e87c119fdef0f11e642561ac4f116ed Author: Gio Lodi <gio@mokacoding.com> Date: Fri Apr 28 13:18:19 2023 +1000 Update app translations – `Localizable.strings` commit 1fa78505bb4dca812074603f10e84e43a28b396f Merge: 3d8591791f 4ae3fe5e03 Author: Jason Johnston <jhnstn@users.noreply.github.com> Date: Thu Apr 27 18:40:05 2023 -0400 Merge pull request #20617 from wordpress-mobile/gutenberg/integrate_release_1.94.0 Integrate gutenberg-mobile release 1.94.0 commit 4ae3fe5e03c7eb132f684e616c2a756b5343a13c Author: jhnstn <jhnstn@pm.me> Date: Thu Apr 27 16:57:57 2023 -0400 Update Gutenberg to 1.94.0 commit 16da725132ea9dbf065d84f925700354ea88a951 Author: jhnstn <jhnstn@pm.me> Date: Thu Apr 27 13:23:23 2023 -0400 Release script: Update gutenberg-mobile ref commit f9abf368f7b23ea70c2a36f55b7dbf607ccdecf3 Author: alpavanoglu <alp.avanoglu@automattic.com> Date: Wed Apr 26 15:32:03 2023 +0200 Update strings to match android implementation commit 3d8591791febb1d77a63ddaf6c4c10f7a1dd87a4 Merge: b3f1ca6807 e5fdeae395 Author: Thomas Horta <thomashorta@gmail.com> Date: Wed Apr 26 16:59:33 2023 -0300 Merge pull request #20608 from wordpress-mobile/fix/reader-prompt-block [Reader] Add --color-neutral-5 to ReaderWebView CSS colors commit b3f1ca6807c32e9f37003ce4390e54683ae00814 Author: Salim <salim.braksa@automattic.com> Date: Wed Apr 26 18:14:49 2023 +0000 Add Domain Purchasing step in Site Creation flow (#20547) commit 2ce2212ecae916f57234963ffa86c557fdb77a53 Author: Salim <salim.braksa@automattic.com> Date: Wed Apr 26 16:43:46 2023 +0000 [Domain Purchasing] Update Suggested Domain Row UI (#20344) commit a9ace6948b63dd693fc88ed773c94bd8ef569237 Author: Povilas Staskus <povilas.staskus@automattic.com> Date: Wed Apr 26 19:36:30 2023 +0300 Domains Dashboard Card: Hide card from P2 (WP for teams) sites (#20589) * Do not show domain dashboard card for P2s * Use blog.supports(.domains) in DomainsDashboardCardHelper - Expand blog.supports(.domains) to have a consistent definition across the app - Reuse it in DomainsDashboardCardHelper * Revert "Use blog.supports(.domains) in DomainsDashboardCardHelper" This reverts commit c741cf99dc95e742ac9a0a5b58e5800779f050a4. commit 651e902bac8314cd494f2a5879c6a1de7362459d Merge: c4ae0c6f26 33d272b6e1 Author: Momo Ozawa <momo-ozawa@users.noreply.github.com> Date: Wed Apr 26 16:24:51 2023 +0100 Merge pull request #20604 from wordpress-mobile/revert-20601-task/20660-dashboard-card-new-label Revert "Dashboard Cards: Add "new" label for dashboard cards" commit c4ae0c6f2688c5a85f4564cdc0165165a04be0db Author: Povilas Staskus <povilas.staskus@automattic.com> Date: Wed Apr 26 18:14:14 2023 +0300 Avoid a crash by posting dashboard settings changed notification on a main thread (#20605) BlogDashboardPersonalizationService may be used on a background thread and called inside a core data perform block. Go to the main thread before notifying about the settings change. commit 6c6b773670f05faa4ba4a156ed21a0eba4a2529f Merge: 3310d268de 02440cd3ea Author: Gio Lodi <gio.lodi@automattic.com> Date: Wed Apr 26 21:23:18 2023 +1000 Make UI tests dismiss prompt to save password (#20583) commit c9c18a55fbec9ff86ab0665402d7f73fc14a9436 Author: Carlos Garcia <fluiddot@gmail.com> Date: Wed Apr 26 13:12:18 2023 +0200 Fix comment typo in `MediaServiceUpdateTests` commit 3310d268ded6d3b34e75f6af5b849add0cd8b113 Merge: c66b575ddc b444b7466b Author: Alp Avanoglu <alp.avanoglu@automattic.com> Date: Wed Apr 26 12:56:52 2023 +0200 Merge pull request #20591 from wordpress-mobile/bug/domain-site-empty-view [Domain Site] Fixes the empty view issue commit 02440cd3ea0d9e8cc16251baf69b5a2a2c69dd74 Author: Gio Lodi <gio.lodi@automattic.com> Date: Wed Apr 26 20:43:06 2023 +1000 Fix typo in a UI tests comment (as -> ask) Co-authored-by: pachlava <73365754+pachlava@users.noreply.github.com> commit 3a2db7455cf3d2a09e0c0d0ba65d3792b8674d4b Merge: bb2e3d3c18 c66b575ddc Author: Carlos Garcia <fluiddot@gmail.com> Date: Wed Apr 26 12:35:24 2023 +0200 Merge branch 'trunk' into update-media-specific-fields commit bb2e3d3c18fd424f9130798cad1b3c41d2ad25d3 Author: Carlos Garcia <fluiddot@gmail.com> Date: Wed Apr 26 12:15:04 2023 +0200 Update release notes commit 7ef7d12a95bfd2e5f1a8ded1c59e8c361c805321 Author: Carlos Garcia <fluiddot@gmail.com> Date: Wed Apr 26 12:13:23 2023 +0200 Add tests to cover media update functionality commit e5fdeae395327f02929a233133fc4efa5857abb9 Author: Thomas Horta <thomas.horta@automattic.com> Date: Tue Apr 25 16:35:38 2023 -0300 Add --color-neutral-5 to ReaderWebView css colors commit a4ac75ee68eea50fa43c51f5d672b90781adbc18 Author: Carlos Garcia <fluiddot@gmail.com> Date: Tue Apr 25 14:28:04 2023 +0200 Only update `postID` for unattached media commit 33d272b6e1bed3cac1142b2128a5661a1bf633b8 Author: Momo Ozawa <momo-ozawa@users.noreply.github.com> Date: Tue Apr 25 16:12:13 2023 +0100 Revert "Dashboard Cards: Add "new" label for dashboard cards" commit c66b575ddc328d199550bfe55b028dba7f168984 Merge: 3ab3c01053 aa9ce9bce7 Author: Momo Ozawa <momo-ozawa@users.noreply.github.com> Date: Tue Apr 25 15:46:15 2023 +0100 Merge pull request #20601 from wordpress-mobile/task/20660-dashboard-card-new-label Dashboard Cards: Add "new" label for dashboard cards commit 3ab3c01053c7fc17538d2577d7c874ed81c4de62 Merge: cf2ef30c66 d9e9d44b27 Author: hassaanelgarem <hassaanelgarem@gmail.com> Date: Tue Apr 25 16:13:17 2023 +0200 Merge pull request #20596 from wordpress-mobile/fix/20593-contributor-dashboard-issues My Site Dashboard: Fix the dashboard not loading for contributors commit cf2ef30c663aa5331c4dbd45067a149da13eae40 Merge: 545892aa71 126fba841e Author: hassaanelgarem <hassaanelgarem@gmail.com> Date: Tue Apr 25 16:13:02 2023 +0200 Merge pull request #20588 from wordpress-mobile/task/20445-pages-card-track-events Dashboard Cards: Pages card track events commit 545892aa71a89c2f38f1e9d5979323c3c7244a0d Merge: efc325fd8a 1fc47c9a18 Author: hassaanelgarem <hassaanelgarem@gmail.com> Date: Tue Apr 25 16:12:30 2023 +0200 Merge pull request #20577 from wordpress-mobile/task/20444-pages-card-create-section Dashboard Cards: Add page creation section to Pages card commit efc325fd8aad079ddf9601cb0b9143a170c8587d Merge: c15b8d0ea4 33c4eda8ac Author: Momo Ozawa <momo-ozawa@users.noreply.github.com> Date: Tue Apr 25 14:37:13 2023 +0100 Merge pull request #20598 from wordpress-mobile/task/20597-activity-log-videopress-icon Activity Log: Add video icon mapping commit aa9ce9bce7208f288eb370d090c5a9ae58f8c780 Author: Momo Ozawa <momo-ozawa@users.noreply.github.com> Date: Tue Apr 25 14:36:29 2023 +0100 Fix typo Co-authored-by: hassaanelgarem <hassaanelgarem@gmail.com> commit aeef0edb69025719392e5d47bd21f84141f1e7bd Author: Momo Ozawa <momo-ozawa@users.noreply.github.com> Date: Tue Apr 25 14:36:16 2023 +0100 Set content hugging priority to resolve width ambiguity Co-authored-by: hassaanelgarem <hassaanelgarem@gmail.com> commit 1d1d33392cb20ae33a313cc9ebb4f36b7980d78d Author: Momo Ozawa <momo-ozawa@users.noreply.github.com> Date: Tue Apr 25 14:35:37 2023 +0100 Update spacing Co-authored-by: hassaanelgarem <hassaanelgarem@gmail.com> commit c15b8d0ea4e3afd47716aa0322020757552e819e Merge: 94443aeb40 40bf2b7c58 Author: Gio Lodi <gio.lodi@automattic.com> Date: Tue Apr 25 22:43:17 2023 +1000 Merge 22.2.0.1 and editorialized release notes (#20602) commit 48586fd4328d3352188221d8f9175edbdedaa372 Author: Carlos Garcia <fluiddot@gmail.com> Date: Tue Apr 25 14:27:32 2023 +0200 Allow updating only specific media details commit ffe864d35562f01d6dcb58dcec2f3d1b40e32499 Author: Carlos Garcia <fluiddot@gmail.com> Date: Tue Apr 25 14:26:26 2023 +0200 Generate remote media object based on fields commit 33c4eda8ac6c3cedd3662f7d713c85b517ed77e9 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Tue Apr 25 13:21:35 2023 +0100 Add missing activity log icons # Conflicts: # WordPress/Classes/ViewRelated/Activity/WPStyleGuide+Activity.swift commit 19b5a64d594e13ca8b7cf3c8d3d11e61ba38e275 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Tue Apr 25 13:18:44 2023 +0100 Update styling commit 40bf2b7c5862d9e2c2d526402d6b7c3bcea6b89c Merge: 85161ef946 94443aeb40 Author: Gio Lodi <gio@mokacoding.com> Date: Tue Apr 25 20:38:18 2023 +1000 Merge branch 'origin/trunk' into merge/release-22.2.0.1-into-trunk commit 599879b8d67f64caec07816d8b5f1d51204a943c Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Tue Apr 25 11:27:55 2023 +0100 Show the “new” label in the pages card commit d9d7ebe0b72927848847ac62fc4d15e98a860ee8 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Tue Apr 25 11:27:41 2023 +0100 Show the “new” label in the activity log card commit d97d519b3ab4c50d79702629a95572fda98b1b9b Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Tue Apr 25 11:27:23 2023 +0100 Add a “new” label to the dashboard card commit 94443aeb402398645730579033ff7d4b7f3e9be4 Merge: 359db4a57a 462487cad6 Author: Momo Ozawa <momo-ozawa@users.noreply.github.com> Date: Tue Apr 25 09:49:44 2023 +0100 Merge pull request #20584 from wordpress-mobile/task/20451-track-activity-log-card-events Dashboard Cards: Track activity log events commit c2abb33d307c6168f37f481fd4f1d99b9e3f2254 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Tue Apr 25 09:46:11 2023 +0100 Add video icon mapping for activity log commit 462487cad63fb792b6d75f5a500a68f3a9c47b15 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Tue Apr 25 09:15:05 2023 +0100 Add source for activity log detail opened event commit 126fba841e0bfbcd9ef00d445b5d56b380eefe5d Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Tue Apr 25 05:11:06 2023 +0200 Update: remove unneeded tab_source property commit 3650f9350c80ff1d168588bedc6537a1c97db85b Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Tue Apr 25 05:07:33 2023 +0200 Update: rename sub_type property to item_type For the `dashboardCardItemTapped` event commit d9e9d44b27de9c4aa8051f5a4254ca22145fb709 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Tue Apr 25 04:58:45 2023 +0200 Test: add a test for hiding the stats card commit bdadd9cc87518a2a4a8fec489fcdca3f2e9291a2 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Tue Apr 25 04:58:35 2023 +0200 Test: fix the tests build errors commit c1aa73525af8f447e7ac9501dfe9afdd3b11a3f9 Merge: 487d0f9fe5 1fc47c9a18 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Tue Apr 25 03:41:44 2023 +0200 Merge branch 'task/20444-pages-card-create-section' into fix/20593-contributor-dashboard-issues # Conflicts: # WordPress/Classes/ViewRelated/Blog/Blog Dashboard/DashboardCard.swift # WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Service/BlogDashboardRemoteEntity.swift commit f9d0fa5626cb0f383f8f11a6dddf22fd99bb4352 Merge: ae62213a62 1fc47c9a18 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Tue Apr 25 03:22:04 2023 +0200 Merge branch 'task/20444-pages-card-create-section' into task/20445-pages-card-track-events commit 1fc47c9a180c44be43ac89a8722be52bc5f73022 Merge: de0894ace2 359db4a57a Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Tue Apr 25 03:21:28 2023 +0200 Merge branch 'trunk' into task/20444-pages-card-create-section commit 487d0f9fe563af4ca9cf207a1306ce84548bf5ab Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Tue Apr 25 03:20:29 2023 +0200 Update: gracefully handle endpoint errors commit 0172550a7ff9628fbdcd1341ac9b6ae174a8df0c Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Tue Apr 25 03:19:36 2023 +0200 Add: new struct `FailableDecodable` That acts as a wrapper for decodable types that we want to mark as failable. commit a5e57da7bde6fdfa35bd4936f0c3192b25369183 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Tue Apr 25 02:48:16 2023 +0200 Update: only request supported cards commit d0643e1ce0d2c67383d438b3f53277a4c0cda1bf Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Mon Apr 24 18:15:58 2023 +0100 Define source identifier for backup / restore vcs commit bb0fa09e494ba2ffbc03874ba82422149866d5a4 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Mon Apr 24 17:51:37 2023 +0100 Only capture tap source for activity log viewed commit b444b7466ba07f6f9f7c3d22e449c75308ee4352 Author: alpavanoglu <alp.avanoglu@automattic.com> Date: Mon Apr 24 17:06:23 2023 +0200 Move visibility toggling out of `else` statement commit d7d40f0ae5298d686118646b71f2f66a6edf87d2 Merge: 370170274a 359db4a57a Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Mon Apr 24 12:03:05 2023 +0100 Merge branch 'trunk' into task/20451-track-activity-log-card-events commit 370170274a5565415cceb103a93ab7d04073dae5 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Mon Apr 24 11:58:45 2023 +0100 Track activity log viewed from dashboard card commit 359db4a57a28e532c815138e916bdcd80d284e9c Merge: db918bada5 d457494341 Author: Alp Avanoglu <alp.avanoglu@automattic.com> Date: Mon Apr 24 12:30:49 2023 +0200 Merge pull request #20552 from wordpress-mobile/design-system-brand-color [Design System] Transfer Muriel Colors & Add DS Gallery commit 9a2f5797192ae0a1bb094f87a0910ef3f8a6d514 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Mon Apr 24 11:28:06 2023 +0100 Track activity log viewed from site menu commit db918bada500cc525df993a0d687af170e817048 Merge: 0030daf163 5bb5813884 Author: Momo Ozawa <momo-ozawa@users.noreply.github.com> Date: Mon Apr 24 11:10:32 2023 +0100 Merge pull request #20582 from wordpress-mobile/fix/activity-log-vs-backup Activity Log: Explicitly set Activity Store to return all items commit 0030daf163493cd6b313a0c75a8047ba40cae2ea Merge: 120a21b4ef 0563162627 Author: Momo Ozawa <momo-ozawa@users.noreply.github.com> Date: Mon Apr 24 11:10:19 2023 +0100 Merge pull request #20569 from wordpress-mobile/task/20447-display-activities Dashboard Cards: Display the 3 latest activities commit 120a21b4ef24b057762f57875a6db11effab9fb2 Merge: 2de70aebc4 6967717494 Author: pachlava <73365754+pachlava@users.noreply.github.com> Date: Mon Apr 24 12:17:53 2023 +0300 Merge pull request #20587 from wordpress-mobile/add-dashboard-mocks [UI Tests] Added missing dashboard mocks commit 2de70aebc46b8ecd79bd5805d0171ded07f03a2c Merge: cc9a26e8eb 30f9fd7617 Author: Carlos Garcia <fluiddot@gmail.com> Date: Mon Apr 24 10:00:42 2023 +0200 Merge pull request #20580 from wordpress-mobile/gutenberg/enable-videopress-block [Gutenberg] Enable VideoPress block commit 6967717494bcc12df71ff58b3a36bcca0d9375f3 Author: pachlava <73365754+pachlava@users.noreply.github.com> Date: Mon Apr 24 10:56:58 2023 +0300 Added a missing newline in `domains.json` mock commit ae62213a627a62cfbc7ca2ad28c255959a313cd8 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Mon Apr 24 05:41:35 2023 +0200 Update: track create page action commit f7e1579bd8dea7c134d6f21ba60651ea399e03ca Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Mon Apr 24 05:28:09 2023 +0200 Update: track pages list events commit df81c5c485cff2d075fc44a2839eb7b654856a8a Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Mon Apr 24 05:10:27 2023 +0200 Update: track card item taps commit 44c2037dcccb37b5da44d4e3847d0c0130a0d822 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Mon Apr 24 04:42:27 2023 +0200 Update: track pages card shown commit 645fdb81386309e9f82e2410a5947a7d9ed0a6ef Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Mon Apr 24 04:19:15 2023 +0200 Remove: unneeded placeholder function commit b8a6f34f1017d99f07a63ed4669394fd53d38c36 Author: pachlava <pachlava@gmail.com> Date: Fri Apr 21 22:12:15 2023 +0300 Added missing dashboard mocks commit 30f9fd7617432aef2d292cdb00e3b16af20f9d11 Author: Carlos Garcia <fluiddot@gmail.com> Date: Fri Apr 21 19:42:52 2023 +0200 Update Gutenberg Mobile ref with alpha tag commit cc9a26e8ebc5560ac4e59cdcbe234c714e5b26f8 Merge: e8446c6ee2 d817a7de1a Author: pachlava <73365754+pachlava@users.noreply.github.com> Date: Fri Apr 21 20:33:23 2023 +0300 Merge pull request #20562 from wordpress-mobile/add-domains-card-ui-test [UI Tests] Add Domains Dashboard Card UI test commit 35e7d6e003bb1c08154a12a72dbf12e79dee5f1c Author: Carlos Garcia <fluiddot@gmail.com> Date: Fri Apr 21 19:08:13 2023 +0200 Update release notes commit e8446c6ee2c5f20e1954b22853297b2c83a313b7 Merge: 8a0c2b4065 59d1f84739 Author: Carlos Garcia <fluiddot@gmail.com> Date: Fri Apr 21 18:08:54 2023 +0200 Merge pull request #20585 from wordpress-mobile/gutenberg/fix-emoji-case-vp-upload-processor [Gutenberg] Fix range out of bounds exception in block upload processor commit d457494341c8a92a7a79d6be50dc905003c5b17e Author: alpavanoglu <alp.avanoglu@automattic.com> Date: Fri Apr 21 17:42:58 2023 +0200 Revert unwanted podfile change commit 70232fbe355c8cc666a1824a83d3b8a37ad5aef1 Merge: 85161ef946 beadde4a11 Author: Gerardo Pacheco <gerardo.pacheco@automattic.com> Date: Fri Apr 21 17:37:19 2023 +0200 Merge pull request #20574 from wordpress-mobile/gutenberg/integrate_release_1.93.1 Integrate gutenberg-mobile release 1.93.1 commit 68e47ad8d644d53d3356a932b50f48578c787f62 Author: alpavanoglu <alp.avanoglu@automattic.com> Date: Fri Apr 21 17:23:33 2023 +0200 Add access modifiers & `DesignSystemColorNames` commit 8a0c2b4065d7765931c66ac1598c6a243cbab94a Merge: 54aaeccfae 9e320b70ca Author: David Christiandy <1299411+dvdchr@users.noreply.github.com> Date: Fri Apr 21 22:23:01 2023 +0700 Merge pull request #20567 from wordpress-mobile/fix/20565-assign-default-for-nil-sitename Fix: Use default value for nil sitenames when displaying a notice commit 6851014e42ee6cd509bc7294c1157479e5dda02d Author: alpavanoglu <alp.avanoglu@automattic.com> Date: Fri Apr 21 16:42:38 2023 +0200 Remove `theme` section and move `brand` to `background` commit 59d1f84739dc9fa214e4dd6c2a81473008df35f7 Author: Carlos Garcia <fluiddot@gmail.com> Date: Fri Apr 21 16:39:33 2023 +0200 Add test to cover emoji case in upload processor commit 281c057cb69434000e6e8f7800f631f345961c9e Author: Carlos Garcia <fluiddot@gmail.com> Date: Fri Apr 21 16:21:03 2023 +0200 Update substring calculation of `isSelfClosingTag` commit 35c60f60dfe3b3678b3e64e054d1e915d5a9dcc7 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Fri Apr 21 15:05:22 2023 +0100 Track dashboard card item tapped commit 2e4786e141df0df00341014ee2cbb5a01c10d9b4 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Fri Apr 21 15:05:12 2023 +0100 Track dashboard card shown commit 1bc70687635a949a823ee96d840954e1d304890c Author: Gio Lodi <gio@mokacoding.com> Date: Fri Apr 21 22:17:23 2023 +1000 Update JetpackUITests scheme to use new test plan location The location changed in 8bc84e9517f94923e053a5a13b44165fc8e396f0 commit dc76490ed21eabc06d9308437f02559c4c0118f1 Author: Gio Lodi <gio@mokacoding.com> Date: Fri Apr 21 22:17:04 2023 +1000 Make UI tests dismiss prompt to save password commit beadde4a113591cb99880fa76c9db79f5ff3d2a4 Author: Gerardo <gerardo.pacheco@automattic.com> Date: Fri Apr 21 14:09:40 2023 +0200 Update Gutenberg ref commit 54aaeccfae14d8e0dc32a36f498d7b8433ca558c Merge: cffe8d49ca c653367c6c Author: Siobhan Bamber <siobhan@automattic.com> Date: Fri Apr 21 12:19:53 2023 +0100 Merge pull request #20571 from wordpress-mobile/gutenberg/emit-save-events-following-preview-and-toggle Gutenberg Mobile: Emit save event to Gutenberg upon preview commit d817a7de1a691e6060304e00f7c9281779ff62ba Author: pachlava <pachlava@gmail.com> Date: Fri Apr 21 14:17:56 2023 +0300 Updated the expected Domains Card copy commit b1c2f19d32fba80d1771f78cd5c764421c3c0407 Merge: 6daeaab698 cffe8d49ca Author: pachlava <pachlava@gmail.com> Date: Fri Apr 21 14:01:54 2023 +0300 Merge branch 'trunk' into add-domains-card-ui-test commit 5bb58138840e4af90f991cda0e74a4225e648e62 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Fri Apr 21 11:57:55 2023 +0100 Fix activity store only showing rewindable items commit c6a284fab54eb0ca120e9db368d59619e329c53b Author: Carlos Garcia <fluiddot@gmail.com> Date: Fri Apr 21 12:32:41 2023 +0200 Update release notes commit 521474706142108ff5761480ed7ec453019d96f9 Author: Carlos Garcia <fluiddot@gmail.com> Date: Fri Apr 21 12:27:56 2023 +0200 Update Gutenberg Mobile ref commit 6daeaab698fd3cff218929c7d3e8f0c90283c108 Author: pachlava <pachlava@gmail.com> Date: Fri Apr 21 13:20:03 2023 +0300 Added an accessibilityIdentifier and a scroll to domains card commit c653367c6cb89688bd58cf238dc6b3d51bb9857d Author: Siobhan <siobhan@automattic.com> Date: Fri Apr 21 10:42:02 2023 +0100 Revert "feat: Send save event when toggling editor modes" This reverts commit 133107a0cb8555b8359c1a61beb4798b00a9f76f. commit 2b1c322c459f2f0346e7d96fc141a834497c8002 Author: David Christiandy <1299411+dvdchr@users.noreply.github.com> Date: Fri Apr 21 16:39:26 2023 +0700 Update comment body style to match app colors commit 7639a21f4c4c690dc110a56fd919e45852e9bcbc Author: Gerardo <gerardo.pacheco@automattic.com> Date: Fri Apr 21 10:44:21 2023 +0200 Update Gutenberg ref commit 05631626273d1a99104ce994cb809a76c6fcb891 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Fri Apr 21 09:10:51 2023 +0100 Define a constant for the backup / restore source commit 240640c327659a715447e1ff78f2044d876ebb75 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Fri Apr 21 09:05:53 2023 +0100 Don’t set the backup status delegate commit 5d207910978ef39f3eee77511987b70114df750f Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Fri Apr 21 09:04:26 2023 +0100 Return nil if cell can’t be dequeued commit cffe8d49ca3ce901427c6df989252c7b13a232ee Author: Povilas Staskus <povilas.staskus@automattic.com> Date: Fri Apr 21 10:18:35 2023 +0300 Domains Dashboard Card: Card UI v2 (#20570) * Create a decorative search view for DomainDashboardCard - A placeholder view for a search bar that suggests searching a domain - A view adapts to light and dark mode and fades out - Accessibility is turned off since it serves the same purpose as an image * Integrate search view in DashboardDomainsCardCell * Fix typo with DashboardDomainsCardSearchView name commit 9e320b70cac245870b208f3f84322f2569e42590 Author: David Christiandy <1299411+dvdchr@users.noreply.github.com> Date: Fri Apr 21 12:49:20 2023 +0700 Add missing import commit de0894ace20533ef02be7d7f4f7158e4c448c138 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Thu Apr 20 23:18:37 2023 +0200 Update: handle large content size categories commit 5b7ed1207ce9c82f7a6f1d2fd249d7c43dff9909 Merge: 0cb04ebd76 4217f80525 Author: Siobhan Bamber <siobhan@automattic.com> Date: Thu Apr 20 21:14:42 2023 +0100 Merge pull request #20522 from wordpress-mobile/gutenberg/emit-editor-save-events [Gutenberg] Emit editor save events commit 3ec57c8d33b917ded1eed24e9be335e2b5307d83 Merge: 133107a0cb 4217f80525 Author: Siobhan <siobhan@automattic.com> Date: Thu Apr 20 19:55:20 2023 +0100 Merge branch 'gutenberg/emit-editor-save-events' into gutenberg/emit-save-events-following-preview-and-toggle commit 4217f80525813e4006e51a6ebad5921fbe3ee8b0 Author: Siobhan <siobhan@automattic.com> Date: Thu Apr 20 19:54:13 2023 +0100 Fix incorrect checksum commit 186ac85f8e72418c85cc1b8e33bc1e7cc3df7abd Merge: 0fcd4a04ca 0cb04ebd76 Author: Siobhan Bamber <siobhan@automattic.com> Date: Thu Apr 20 19:49:15 2023 +0100 Merge branch 'trunk' into gutenberg/emit-editor-save-events commit 0fcd4a04ca20f5b64d47f165078bc04051262f34 Author: Siobhan <siobhan@automattic.com> Date: Thu Apr 20 19:49:38 2023 +0100 Update Gutenberg Mobile reference commit ea5183d64085d9b2dfe9935669fb8587f61edd7c Author: Gerardo <gerardo.pacheco@automattic.com> Date: Thu Apr 20 20:46:27 2023 +0200 Update Gutenberg ref commit 001ed01450a4ae872658a97bee44d08a263872f4 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Thu Apr 20 19:57:19 2023 +0200 Update: Reduce bottom padding in compact creation cell commit f831158bc5a9f4a99d988d02f479fe34ddcf0804 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Thu Apr 20 19:49:12 2023 +0200 Update: fix cell not respecting compact height commit 0cb04ebd76d591d91c9a1a732f32b1145e07cd35 Merge: 9076bf4b36 120ff0356e Author: Carlos Garcia <fluiddot@gmail.com> Date: Thu Apr 20 18:26:57 2023 +0200 Merge pull request #20563 from wordpress-mobile/gutenberg/update/videopress-upload-processor [Gutenberg] Update VideoPress upload processor (support self-closing block tag) commit 2dd5d0de0ee23bf498d29d370d5971d6b1cf8f01 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Thu Apr 20 17:14:43 2023 +0100 Remove FIXME comments No need to check to see if there’s a backup / restore already running in the activity log card. Users will see an error message if they tap the backup / restore buttons in the activity details screen, and there’s a backup or restore running already commit 84b32045bae812841e3136b4526cde2b1c236b90 Author: David Christiandy <1299411+dvdchr@users.noreply.github.com> Date: Thu Apr 20 23:09:08 2023 +0700 Use the static main instance instead of the app delegate commit 133107a0cb8555b8359c1a61beb4798b00a9f76f Author: Siobhan <siobhan@automattic.com> Date: Thu Apr 20 14:13:53 2023 +0100 feat: Send save event when toggling editor modes commit 87cc16fa922edaa49f499a0a3d70a060a7eed7fa Author: Siobhan <siobhan@automattic.com> Date: Thu Apr 20 14:06:17 2023 +0100 feat: Emit save event when post is previewed commit edb61e1b703b47b42f103f3bf29a4c55d1a70ae9 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Thu Apr 20 14:05:09 2023 +0100 Fix dashboard unit tests commit 9649d1aa85dc9aea91263a17b1f7a19a2260c4f5 Author: pachlava <pachlava@gmail.com> Date: Thu Apr 20 12:35:16 2023 +0300 Moved Domains screen assertion to the screen file. commit 9173621ac411daf4c4ab0eba87d91e74147f3ff0 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Thu Apr 20 11:41:26 2023 +0100 Show activity log when user taps the header commit c7d536f89526dc8feaba5e6064727c003f41b22b Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Wed Apr 19 13:32:08 2023 +0100 Hide activity log card if there’s no activities commit 41e658f49a22f0e6d35318b5100dc51a20f82930 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Thu Apr 20 11:31:58 2023 +0100 Implement activity presentation methods commit f9a3012f57c5ed22fa77613c387994f7f932977e Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Tue Apr 18 14:13:55 2023 +0100 Display activity fetched from endpoint commit 9076bf4b36440859b33c88dd153874d6e5fc72c2 Merge: 443fd5b298 ab04f869f4 Author: Momo Ozawa <momo-ozawa@users.noreply.github.com> Date: Thu Apr 20 11:05:02 2023 +0100 Merge pull request #20551 from wordpress-mobile/task/20482-refactor-activity-v2 Dashboard Cards: Refactor Activity commit 184029c7fc0f21ad7a974fbdd19d31de3ad40a81 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Tue Apr 18 10:43:11 2023 +0100 Fetch activity from dashboard endpoint commit d1b610c1ea19af7b04aca030a4a518de1526ad53 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Thu Apr 20 11:01:31 2023 +0100 Update dashboard activity log endpoint response commit b4b03a7daa968b9e334a0ae6822a766bed803a38 Author: David Christiandy <1299411+dvdchr@users.noreply.github.com> Date: Thu Apr 20 16:23:08 2023 +0700 Use default value for nil sitenames when displaying a notice commit ab04f869f4aa3bc2459f39305f11b13eb80430c0 Merge: 00e47d9070 443fd5b298 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Thu Apr 20 10:18:44 2023 +0100 Merge branch 'trunk' into task/20482-refactor-activity-v2 # Conflicts: # Podfile # Podfile.lock # WordPress/WordPressTest/Activity/ActivityListViewModelTests.swift # WordPress/WordPressTest/ActivityContentRouterTests.swift commit 71dbf793c6d5b9cd73cf5564fb6c71df0046a4c2 Author: pachlava <pachlava@gmail.com> Date: Thu Apr 20 12:12:49 2023 +0300 Disabled the test for WP. commit 85161ef946c42a69e5fb856e2161179d6ed6a0eb Author: Gio Lodi <gio@mokacoding.com> Date: Thu Apr 20 15:47:16 2023 +1000 Bump version number commit 32b7047e060e3998401609aa947ed10717bc4619 Author: Gio Lodi <gio@mokacoding.com> Date: Thu Apr 20 15:47:02 2023 +1000 Update Jetpack metadata translations commit f3cdc9cbb860ef36e17bac7df41d3a5a17687ad7 Author: Gio Lodi <gio@mokacoding.com> Date: Thu Apr 20 15:46:56 2023 +1000 Update WordPress metadata translations commit 850c91ff05966d9f84918568669e5297bfe8c860 Author: Gio Lodi <gio@mokacoding.com> Date: Thu Apr 20 15:46:32 2023 +1000 Update app translations – `Localizable.strings` commit ee95f7ca411ff5799e91d24401194e6de1a321a1 Author: Gio Lodi <gio@mokacoding.com> Date: Thu Apr 20 15:44:38 2023 +1000 Update metadata strings commit 6c0b7d273c300dd2e2e961f3f7bcd16bf3cc96fe Author: Gio Lodi <gio@mokacoding.com> Date: Thu Apr 20 15:44:33 2023 +1000 Update metadata strings commit 6d22d8ed868b0b9dd4c67c48cb55341257e19cb5 Author: Gio Lodi <gio@mokacoding.com> Date: Thu Apr 20 15:44:11 2023 +1000 Add editorialized release notes for Jetpack 22.2 commit 9b0e667fdaa009d31c6bf6df836aaa7070ef2239 Author: Gio Lodi <gio@mokacoding.com> Date: Thu Apr 20 15:42:28 2023 +1000 Add editorialized release notes for WordPress 22.2 commit 8045edbee8b0d19dce33ca7055dc9ff761c555f9 Merge: 0e575d0e87 f0743a9ab4 Author: hassaanelgarem <hassaanelgarem@gmail.com> Date: Thu Apr 20 02:01:17 2023 +0200 Merge pull request #20556 from wordpress-mobile/fix/20519-scrollToTop-crash Notifications: Fixes a crash when tapping the notifications tab multiple times right after launch commit 650ceabb75140c9a3f9411fc803af2998ab42eff Author: pachlava <pachlava@gmail.com> Date: Wed Apr 19 22:21:27 2023 +0300 Trying a rerun to rebuild JP prototype build commit b0ba4c50aa3286884a5904200a5007e103514b07 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Wed Apr 19 20:33:37 2023 +0200 Update: fix creation cell height commit 443fd5b2988025f9e29e64acaad4b12f12cedd30 Merge: 16adc688f7 aea49fc51b Author: Gio Lodi <gio.lodi@automattic.com> Date: Thu Apr 20 04:01:38 2023 +1000 Merge 22.2 code freeze (#20560) commit 120ff0356e7c7efc08bcc66c0535ac2289e3749c Author: Carlos Garcia <fluiddot@gmail.com> Date: Wed Apr 19 19:42:06 2023 +0200 Update `isSelfClosingTag` function commit 1365f880b06d21b7ef33f06c4b2a6ac229a3bf85 Author: Siobhan <siobhan@automattic.com> Date: Wed Apr 19 16:26:05 2023 +0100 chore: Update Gutenberg Mobile reference commit 2fe376a38649635afffac2f8c68724871d3a7c7e Author: Carlos Garcia <fluiddot@gmail.com> Date: Wed Apr 19 17:14:04 2023 +0200 Remove `src` attribute in VideoPress upload processor commit 51d849c9f260024a268be26878de234782657d88 Author: pachlava <pachlava@gmail.com> Date: Wed Apr 19 15:06:36 2023 +0300 Added a mock file for `feature-flags` and renamed a test commit b5b5c1a7edad8d17b86e3e6d90b87b7678510806 Author: Carlos Garcia <fluiddot@gmail.com> Date: Wed Apr 19 13:45:56 2023 +0200 Remove processing HTML in VideoPress upload processor commit b886c9e5f8e624505d7836001b128cff16069a6c Author: Carlos Garcia <fluiddot@gmail.com> Date: Wed Apr 19 13:45:21 2023 +0200 Update Gutenberg block processor to support self-closing block tags commit 0e575d0e87fa7dc4858140ffc56d3e73c1eb76b3 Author: Povilas Staskus <povilas.staskus@automattic.com> Date: Wed Apr 19 13:12:42 2023 +0300 Fix Domains Service initializer crash when wordPressComRestApi is nil (#20559) * Do not refresh domains if wordPressComRestApi is not initialized * Only refresh domains when domains dashboard card feature is enabled commit f0743a9ab4092ada483ab519c4d50ea36ebb9829 Merge: 430d6aa491 78044cefe1 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Wed Apr 19 10:54:29 2023 +0200 Merge branch 'release/22.2' into fix/20519-scrollToTop-crash commit aea49fc51b4bd0e20fa216ae8ac778ecf2022015 Merge: 78044cefe1 16adc688f7 Author: Gio Lodi <gio@mokacoding.com> Date: Wed Apr 19 18:06:59 2023 +1000 Merge 'origin/trunk' into merge/release-22.2-code-freeze-take-2 commit 78044cefe1c13627d338de8ef3201d75f8e6a12a Author: Gio Lodi <gio@mokacoding.com> Date: Wed Apr 19 18:04:33 2023 +1000 Update WordPressKit to 8.0.0 This is necessary for the unit tests to pass after the 7.2.0 upgrade, which had a bug. commit c7582737e913ea08f166e4e64e5ca14ead7724f5 Author: Gio Lodi <gio@mokacoding.com> Date: Wed Apr 19 17:37:51 2023 +1000 Fix tests not compiling after WordPressKit 7.2.0 upgrade commit a9f2a2f1067c6643899f8eace0bb019e72ba316f Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Wed Apr 19 06:40:45 2023 +0200 Update: correctly configure page creation cell commit 733cdc00f7a9bd59518ae56c99e909d8a3322942 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Wed Apr 19 06:40:23 2023 +0200 Update: create item based on the number of pages commit f7b8e94db33f541269564f55fe09862d1a5bb0b7 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Wed Apr 19 06:10:23 2023 +0200 Update: handle tapping outside the create button commit 9b01fc0470894b1f754b159873bafad1a48d3ee6 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Wed Apr 19 06:00:22 2023 +0200 Update: implement create page button action commit d5559e087ac63fbbe39ddc048165f9e2d71cd29d Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Wed Apr 19 05:39:21 2023 +0200 Update: add promo image to create section commit 38f56b1e90b4fea517dc02f055e6941c74f3e3ab Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Wed Apr 19 02:30:32 2023 +0200 Update: add button and description label commit 6dab01ac3c73a05f24bdb0e6fc4877399c26d1b2 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Wed Apr 19 00:27:15 2023 +0200 Update: hook up new cell to the card commit ad937f7f4ae9c7139ab72a81d2a711c563fa052e Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Wed Apr 19 00:22:52 2023 +0200 Add: Skeleton implementation of the page creation cell commit 3111d78f2456b11217b7c3709c9156b51e5efd08 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Wed Apr 19 00:07:59 2023 +0200 Update: add empty create page section to the cell commit c33d192069dcb893f0b8d72db30fae7efa6ce252 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Tue Apr 18 23:54:28 2023 +0200 Update: Decouple `PagesListSection` from card state logic commit 569a970acbff23f05f087de476b4a43378991675 Author: Siobhan <siobhan@automattic.com> Date: Tue Apr 18 17:28:55 2023 +0100 chore: Update Gutenberg Mobile reference commit 4e151af0d884e447eb888db305ef36635a079302 Author: Siobhan <siobhan@automattic.com> Date: Tue Apr 18 17:24:52 2023 +0100 Revert "chore: Update Gutenberg Mobile reference" This reverts commit aa93c70da76beb1427325048a522e4e995ae0f87. commit f6b9f9ac93acba4cf4e3ab53c3c85215c9b41f11 Merge: 4e944ebdd9 16adc688f7 Author: Siobhan <siobhan@automattic.com> Date: Tue Apr 18 16:49:28 2023 +0100 Merge branch 'trunk' into gutenberg/emit-editor-save-events commit 4e944ebdd90613e7a0960d37f64f5c4afe5bbb92 Author: Siobhan <siobhan@automattic.com> Date: Tue Apr 18 14:59:39 2023 +0100 refactor: Change location of emitPostSaveEvent() Feedback ref: https://github.com/wordpress-mobile/WordPress-iOS/pull/20522#discussion_r1169930544 commit aa93c70da76beb1427325048a522e4e995ae0f87 Author: Siobhan <siobhan@automattic.com> Date: Tue Apr 18 14:56:53 2023 +0100 chore: Update Gutenberg Mobile reference commit 07ddf84736968bc5bd9f782088186f68323a499a Author: Siobhan <siobhan@automattic.com> Date: Tue Apr 18 14:38:51 2023 +0100 docs: Clarifying comments within empty funcs commit 60c68e596264e5120c034971d57295ab72c927f9 Author: pachlava <pachlava@gmail.com> Date: Tue Apr 18 14:55:29 2023 +0300 First iteration of `testDomainsCard` test commit d7584cea3350e88e1898b5b0e8f25d1462f4c95b Author: Siobhan <siobhan@automattic.com> Date: Tue Apr 18 11:20:14 2023 +0100 refactor: Remove second function call commit 8fafd62b1cbfb8372c2640c8d1232e4ffedf40ff Author: Siobhan <siobhan@automattic.com> Date: Tue Apr 18 11:19:55 2023 +0100 refactor: Remove accidental deletion of lines commit 430d6aa49179ec3b7c2549e2b75fef08075d361c Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Tue Apr 18 04:24:33 2023 +0200 Update: only scroll to top if the notifications view is loaded commit 16adc688f718136ea57c45d5d26c5c13de9d2b9f Merge: 3e1288ab78 defc57b2c7 Author: hassaanelgarem <hassaanelgarem@gmail.com> Date: Tue Apr 18 03:39:15 2023 +0200 Merge pull request #20549 from wordpress-mobile/fix/20521-scheduled-posts-modified-date Scheduled Posts: Fix date modified being set to future date commit 6a1b50a12569b9cb26398d3e7f59cc61aab0b81e Author: Siobhan <siobhan@automattic.com> Date: Mon Apr 17 21:33:41 2023 +0100 chore: Update Gutenberg Mobile reference commit 5a080ca4010410aef5360ba823287ec6d3602992 Merge: 397dab71cd 3e1288ab78 Author: Siobhan <siobhan@automattic.com> Date: Mon Apr 17 21:25:04 2023 +0100 Merge branch 'trunk' into gutenberg/emit-editor-save-events commit 397dab71cddf85dcacdba3384efb533758108114 Author: Siobhan <siobhan@automattic.com> Date: Mon Apr 17 19:58:22 2023 +0100 feat: Emit save event after manual save commit 3e1288ab78af834e5100fa5924368654cbb6e985 Merge: 893b541cb2 60fcd01c82 Author: Carlos Garcia <fluiddot@gmail.com> Date: Mon Apr 17 18:06:47 2023 +0200 Merge pull request #20511 from wordpress-mobile/gutenberg/excerpt-strip-videopress-block Strip Gutenberg VideoPress block for excerpt commit 60fcd01c8299bd9e6037a18a32b6ad07dff47600 Author: Carlos Garcia <fluiddot@gmail.com> Date: Mon Apr 17 16:24:57 2023 +0200 Point WordPressShared pod to `trunk` commit 491b1049d890d04c563c28d6473ef18a28e801ee Merge: 07fb5297ad 893b541cb2 Author: Carlos Garcia <fluiddot@gmail.com> Date: Mon Apr 17 16:09:34 2023 +0200 Merge branch 'trunk' into gutenberg/excerpt-strip-videopress-block # Conflicts: # Podfile.lock commit 00e47d9070376d7cee4b2d9c9641d04679581bb8 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Mon Apr 17 14:47:50 2023 +0100 Fix whitespace violation commit 3ffe092a34e2858790ae1f9a455b4519709d2d1a Author: alpavanoglu <alp.avanoglu@automattic.com> Date: Mon Apr 17 15:28:13 2023 +0200 Update gallery commit 4c45b474c16a49b25b867e2cab92e6d4ed76bd07 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Mon Apr 17 14:27:04 2023 +0100 Get latest changes from WPKit branch commit 2e33e487a54bb14af4e44915e9ee969b8d277fc0 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Mon Apr 17 14:11:12 2023 +0100 Define coding keys for BlogDashboardPosts commit 6c6d2156c021914346298a0a993d7c3c694fd087 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Mon Apr 17 14:10:59 2023 +0100 Add date decoding strategy extension commit 48fb4842b385519df0e1db7051cb41d27b99ecbd Author: alpavanoglu <alp.avanoglu@automattic.com> Date: Mon Apr 17 14:18:01 2023 +0200 Add border colors commit 893b541cb23ae539c427472bb1744398a9239ac7 Author: Tiago Marques <42008628+tiagomar@users.noreply.github.com> Date: Mon Apr 17 05:52:49 2023 -0300 Update PULL_REQUEST_TEMPLATE.md (#20546) commit defc57b2c77f5d6e2c5ec7dbb7f042508b1ade7c Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Mon Apr 17 04:15:51 2023 +0200 Update: update scheduled posts right after creation commit b8b8f95487b71162a60cead7bb2fe939c4812c21 Author: Gio Lodi <gio@mokacoding.com> Date: Mon Apr 17 06:11:41 2023 +1000 Update strings for localization commit d486a37bbcd34b9944385fa34c0beb4f8feab15f Author: Gio Lodi <gio@mokacoding.com> Date: Mon Apr 17 06:10:53 2023 +1000 Remove Jetpack-only entries from raw release notes for WordPress 22.2 commit 8ef0e06a28739ad8a7c1fbeadac47445b31d2262 Author: Gio Lodi <gio@mokacoding.com> Date: Mon Apr 17 06:09:45 2023 +1000 Remove Jetpack-only header from raw release notes for Jetpack 22.2 commit dff1b5e8e501fffb09d0fcbb00c7e42544c85b8a Author: Gio Lodi <gio@mokacoding.com> Date: Mon Apr 17 06:08:32 2023 +1000 Use production versions of internal pods for release 22.2 Notice the AppAuth patch version bump, which was due to running `bundle exec pod update WordPressAuthenticator`. commit 6cd180fb9a5682fbd1a18788fa2623dcb58f5a8f Author: Gio Lodi <gio@mokacoding.com> Date: Mon Apr 17 06:06:04 2023 +1000 Release Notes: add new section for next version (22.3) commit 6eea86780a5b211706d23cf1f175909e0dfd014a Author: Gio Lodi <gio@mokacoding.com> Date: Mon Apr 17 06:06:03 2023 +1000 Update draft release notes for 22.2. commit f9b98c8654f9da0500ffeee52532e1b91c362b76 Author: Gio Lodi <gio@mokacoding.com> Date: Mon Apr 17 06:06:03 2023 +1000 Update draft release notes for 22.2. commit 9649a91ed9cbb6533adc8c005156031ceb7cedd8 Author: Gio Lodi <gio@mokacoding.com> Date: Mon Apr 17 06:05:59 2023 +1000 Bump version number commit 3c3014121655d95c588424fb0f2849e3b0a08d88 Merge: 4e1446e1b0 9fa398e64c Author: hassaanelgarem <hassaanelgarem@gmail.com> Date: Sun Apr 16 17:38:04 2023 +0200 Merge pull request #20537 from wordpress-mobile/task/20523-pages-card-dark-mode Dashboard Cards: Handle Dark mode for the Pages Card commit 4e1446e1b03fd8e8385266341531296ed8e4df1d Merge: 2be1c540fd 146f667bbc Author: hassaanelgarem <hassaanelgarem@gmail.com> Date: Sun Apr 16 17:37:52 2023 +0200 Merge pull request #20536 from wordpress-mobile/task/20442-pages-card-actions Dashboard Card: Implement Pages card actions commit 2be1c540fd1d61e4f9858ca75ccbd706794b3795 Merge: e0fc0615bc a6d22b2e2e Author: hassaanelgarem <hassaanelgarem@gmail.com> Date: Sun Apr 16 17:34:59 2023 +0200 Merge pull request #20524 from wordpress-mobile/task/20440-populate-pages-card Dashboard Cards: Display latest pages in Pages card commit a6d22b2e2e4d18719204e595a7d3a56ee270ed5b Merge: f806be2a0c e0fc0615bc Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Sun Apr 16 17:02:20 2023 +0200 Merge branch 'trunk' into task/20440-populate-pages-card commit e0fc0615bc46749b5dda1c42b645787d18298463 Merge: c36676c51e 4dc21cafc3 Author: Gio Lodi <gio.lodi@automattic.com> Date: Sun Apr 16 21:40:33 2023 +1000 Reorganize My Site Menu in Jetpack (#20476) commit 4dc21cafc3ee6344c22ab80c53c450d03d1d3249 Author: Gio Lodi <gio@mokacoding.com> Date: Sun Apr 16 21:06:17 2023 +1000 Fix tests failing after changes from `924df4c` commit c36676c51ed1dd283feb0daa5c713d356087fb23 Merge: 6b6121ccf3 2a0e99b3a2 Author: Gio Lodi <gio.lodi@automattic.com> Date: Sun Apr 16 20:56:07 2023 +1000 Fix dashboard card header flashing on launch (#20538) commit 6b6121ccf3ec2af9acad8ff1d61f0ba8e704521f Merge: 4c0a2231f5 73a6c110be Author: Gio Lodi <gio.lodi@automattic.com> Date: Sun Apr 16 20:43:50 2023 +1000 [Doman Purchase] Site Preview UI (#20468) commit 4c0a2231f5c9f8ed9d60a43f21487c759c932de3 Merge: ab86021928 76dad5d1e3 Author: Gio Lodi <gio.lodi@automattic.com> Date: Sun Apr 16 20:23:24 2023 +1000 Update `a8c-ci-toolkit` to latest version, 2.15.1 (#20378) commit 73a6c110be2dfded180513e16fad0fea6e0e7106 Author: Gio Lodi <gio@mokacoding.com> Date: Sun Apr 16 20:04:03 2023 +1000 Track result of running `bundle exec pod install` Sometimes, an out of date local cache can result in `FBReactNativeSpec` changing even when it shouldn't. That must be what happened on the branch we're working here, as shown by this diff and the CI failures at https://buildkite.com/automattic/wordpress-ios/builds/13717#_ commit ab86021928a8089c29cda21a4f09dea84a8ee668 Merge: 1bf637edb3 25c9933b06 Author: Gio Lodi <gio.lodi@automattic.com> Date: Sun Apr 16 19:58:53 2023 +1000 Enable the Core Data Concurrency Debug launch argument (#20510) commit 76dad5d1e3a1ce210292e404f7477737016ec8a2 Author: Gio Lodi <gio@mokacoding.com> Date: Sun Apr 16 19:53:01 2023 +1000 Point release toolkit to version 2.15.1 This patch addresses the logs showing a confusing log that looked like a the tests failed even though they hadn't. commit 1bf637edb3336225bc28cd08b28dcf99de54e39a Merge: 54a0235916 ec3cddca0a Author: David Christiandy <1299411+dvdchr@users.noreply.github.com> Date: Sat Apr 15 02:20:49 2023 +0700 Merge pull request #20545 from wordpress-mobile/fix/jp-individual-plugin-failed-tracks Fix event name for plugin installation failures commit 54a023591600b57fa5b4d2f1b2e978b19a032ab1 Merge: 3825713513 ba90fc0b7b Author: Gio Lodi <gio.lodi@automattic.com> Date: Sat Apr 15 03:45:40 2023 +1000 Merge finalized release 22.1 (#20543) commit ec3cddca0a60de3f240552b846c5220387722e1b Author: David Christiandy <1299411+dvdchr@users.noreply.github.com> Date: Sat Apr 15 00:39:24 2023 +0700 Fix event name for plugin installation failures commit 7cbc77196927c9549405073b9668f99f43f02eea Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Fri Apr 14 18:04:58 2023 +0100 Define coding keys instead of converting from snake case The nested models (i.e. Activity) relies on custom coding keys instead of automatically converting all keys from snake case commit ee65acc317fcdd581ec12f3ae050722cca427db0 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Fri Apr 14 18:02:19 2023 +0100 Fix activity log tests commit d315029fe3d618b3f16452353f90bfd8731e0770 Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Fri Apr 14 17:54:32 2023 +0100 Fix context menu item title Change from “Recent activity” to “All activity” commit 7f79b46a1fd694e9fcf24c5e33bef00517ecfe2d Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Fri Apr 14 17:53:33 2023 +0100 replace BlogDashboardActivity with Activity commit dd0feb1d7542494b66ca1c4e6f8593d5d43091db Author: Momo Ozawa <momo.ozawa@automattic.com> Date: Fri Apr 14 17:51:55 2023 +0100 Temporarily point to WPKit branch commit e6f29fbba2792e2b5bd1035eebaa1aa0cfb0c2e8 Merge: 026d1389b4 3825713513 Author: alpavanoglu <alp.avanoglu@automattic.com> Date: Fri Apr 14 18:26:17 2023 +0200 Merge branch 'trunk' into feature/domain-purchase-preview-ui commit 5197765441a794edb20c1c320092cf02992d4b6d Author: alpavanoglu <alp.avanoglu@automattic.com> Date: Fri Apr 14 18:25:44 2023 +0200 Populate `ColorGallery` commit 77dc717ea5b3dff6b47d21bc83ccb7260c285712 Author: Olivier Halligon <olivier.halligon@automattic.com> Date: Fri Apr 14 15:40:09 2023 +0200 Try out `annotate_test_failures` fix from plugin branch commit 3825713513aa29a380f058308dc0acd7361ff89a Merge: 276f691ccb de779f6a83 Author: Christopher McGraw <2454408+wargcm@users.noreply.github.com> Date: Fri Apr 14 11:51:23 2023 -0400 Merge pull request #20540 from wordpress-mobile/task/20539-enable-prompts-social-feature-flag Blogging Prompts: Enable the blogging prompts social feature flag commit 276f691ccbe320c8c32ef60698663f2c0f9a2809 Author: Povilas Staskus <povilas.staskus@automattic.com> Date: Fri Apr 14 16:54:12 2023 +0300 Fix Domains not presenting on iPad (#20528) Create a separate method to present DomainDashboard directly on the BlogDashboard view controller. This creates a consistent behavior on both iPhone and iPad - Due to SplitViewController, MySiteViewController is not accessible directly on iPad - On iPad, we want to force showing DomainsDashboard inside the current navigation controller, thus .show(..) method is preferred to .showDetail(..) commit 7aad6894c470cab718b766e6fea477df6d048a9e Author: alpavanoglu <alp.avanoglu@automattic.com> Date: Fri Apr 14 14:27:26 2023 +0200 Move Site Creation colors to a custom space commit ffb801ae437597a9c7457c2b63c6cacab8ac6b5b Author: alpavanoglu <alp.avanoglu@automattic.com> Date: Fri Apr 14 13:35:12 2023 +0200 Update color set folder structure commit 75953beecc031cab9c8a88e360abd152023d73c1 Merge: a3d645da00 4032a8740e Author: Gio Lodi <gio.lodi@automattic.com> Date: Fri Apr 14 14:51:15 2023 +1000 Fix a few Xcode 14.3 warnings in unit tests (#20542) commit ba90fc0b7b9a9ef2a05eb5e3c7d11b596ddda3e4 Author: Gio Lodi <gio@mokacoding.com> Date: Fri Apr 14 14:50:06 2023 +1000 Bump version number commit ede04879165d7c12131d06e066a3cfdc7fc59fd0 Author: Gio Lodi <gio@mokacoding.com> Date: Fri Apr 14 14:49:51 2023 +1000 Update Jetpack metadata translations commit 8d8ac8513ba96790b4724405f55bf3adcf930d50 Author: Gio Lodi <gio@mokacoding.com> Date: Fri Apr 14 14:49:45 2023 +1000 Update WordPress metadata translations commit 6cebb2610563d0783181d3b5ba12fff348c662ef Author: Gio Lodi <gio@mokacoding.com> Date: Fri Apr 14 14:49:22 2023 +1000 Update app translations – `Localizable.strings` commit f806be2a0ce2f08029ca2ddce3edc3d6080f7c58 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Fri Apr 14 04:22:11 2023 +0200 Update: maintain page's title font size with long titles commit 4032a8740eb00ab805540276a873d8a5791bec6f Author: Gio Lodi <gio@mokacoding.com> Date: Fri Apr 14 12:06:42 2023 +1000 Update an empty collection type in the tests to the expected one commit f20b8ddbd63fbe6ce5590edf82ed31a633b4198e Author: Tony Li <tony.li@automattic.com> Date: Thu Apr 13 21:11:20 2023 +1200 Fix a few warnings in unit tests commit 00e38f0f4a83d8b646331d4dd63aba6be393a287 Author: Gio Lodi <gio@mokacoding.com> Date: Fri Apr 14 10:34:25 2023 +1000 Update `a8c-ci-toolkit` to latest version, 2.15.0 This was done to fetch and improved CI annotation for flaky tests, see https://github.com/Automattic/a8c-ci-toolkit-buildkite-plugin/pull/46. Change automated via ``` find . -type f -name "*.yml" -exec sed -i '' 's/automattic\/a8c-ci-toolkit#[0-9.]\{1,\}/automattic\/a8c-ci-toolkit#2.15.0/g' {} + ``` commit de779f6a83b331261e9bc51802623f7419ab179f Author: Chris McGraw <2454408+wargcm@users.noreply.github.com> Date: Thu Apr 13 19:32:43 2023 -0400 Add PR number to blogging prompts social release notes commit a0b1ad51dc7edaba76a04204c52e2d05d59a913f Author: Chris McGraw <2454408+wargcm@users.noreply.github.com> Date: Thu Apr 13 19:25:53 2023 -0400 Enable the blogging prompts social feature flag commit 2a0e99b3a28fa97afcf485d110c63d93b57f418a Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Thu Apr 13 22:31:21 2023 +0200 Update: use new API to set title of card frames commit 6107233e9ac527c345d1ac2ddb997763988fd6c4 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Thu Apr 13 22:30:55 2023 +0200 Update: add new API for setting title in `BlogDashboardCardFrameView` commit 9fa398e64cffb782968b60341ca71202dfb0c3b2 Author: Hassaan El-Garem <hassaanelgarem@gmail.com> Date: Thu Apr 13 22:11:42 2023 +0200 Update: apply dark mode style changes commit a3d645da00f4e10bc2237ebd95ed5d7374fc5296 Merge: e54c5d7007 84c9c00759 Author: Gerard…
This PR matches the strings to the Android Implementation
To test:
Paid Domain
Free Domain
Regression Notes
Potential unintended areas of impact
N/A
What I did to test those areas of impact (or what existing automated tests I relied on)
N/A
What automated tests I added (or what prevented me from doing so)
N/A
PR submission checklist:
RELEASE-NOTES.txt
if necessary.