Merge fix

bummytime · bummytime · commit 197455d5fff2 · 2018-09-26T23:15:16.000-05:00
diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/OrderDetailsViewController.swift b/WooCommerce/Classes/ViewRelated/Orders/OrderDetails/OrderDetailsViewController.swift
@@ -613,10 +613,9 @@ extension OrderDetailsViewController: MFMailComposeViewControllerDelegate {
         }
 
         sendEmail(to: email)
-            WooAnalytics.shared.track(.orderContactAction, withProperties: ["id": viewModel.order.orderID,
-                                                                            "status": viewModel.order.status.rawValue,
-                                                                            "type": "email"])
-        }
+        WooAnalytics.shared.track(.orderContactAction, withProperties: ["id": viewModel.order.orderID,
+                                                                        "status": viewModel.order.status.rawValue,
+                                                                        "type": "email"])
     }
 
     private func sendEmail(to email: String) {

Original file line number	Diff line number	Diff line change
`@@ -613,10 +613,9 @@ extension OrderDetailsViewController: MFMailComposeViewControllerDelegate {`
`613`	`613`	`}`
`614`	`614`
`615`	`615`	`sendEmail(to: email)`
`616`		`- WooAnalytics.shared.track(.orderContactAction, withProperties: ["id": viewModel.order.orderID,`
`617`		`- "status": viewModel.order.status.rawValue,`
`618`		`- "type": "email"])`
`619`		`- }`
	`616`	`+ WooAnalytics.shared.track(.orderContactAction, withProperties: ["id": viewModel.order.orderID,`
	`617`	`+ "status": viewModel.order.status.rawValue,`
	`618`	`+ "type": "email"])`
`620`	`619`	`}`
`621`	`620`
`622`	`621`	`private func sendEmail(to email: String) {`