Fix an issue where jetpack site is not merged after WP.com log in

Author: crazytonyli

WordPress/Classes/Services/BlogService.m

@@ -493,7 +493,12 @@ - (void)updateBlogWithRemoteBlog:(RemoteBlog *)remoteBlog account:(WPAccount *)a
 {
     Blog *blog = [self findBlogWithDotComID:remoteBlog.blogID inAccount:account];
 
-    if (!blog && remoteBlog.jetpack) {
+    // Previously the `remoteBlog.jetpack` property is used to check if the `blog` is connected to Jetpack.
+    // However, `jetpack` property indicates whether the Jetpack plugin is installed, and the `jetpack_connection`
+    // property should be the one we should check here.
+    // See this calypso code for reference:
+    // https://github.com/Automattic/wp-calypso/blob/61a1eb0968da82e62d992f8d081a4ab3075c7719/client/dashboard/utils/site-types.ts#L3
+    if (!blog && remoteBlog.jetpackConnection) {
         blog = [self migrateRemoteJetpackBlog:remoteBlog forAccount:account inContext:context];
     }