Merge pull request #487 from IBM-MIL/develop

Submission build
csync · Mar 9, 2017 · 73f5518 · 73f5518
2 parents 0a6fc39 + 7674cbf
commit 73f5518
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/backend/package.json b/backend/package.json
@@ -6,9 +6,9 @@
     "start": "node --max-old-space-size=400 app.js"
   },
   "dependencies": {
-    "bluemix-autoscaling-agent" : "*",
     "@newrelic/native-metrics": "^2.0.2",
     "apn": "^2.1.2",
+    "bluemix-autoscaling-agent": "*",
     "body-parser": "~1.15.1",
     "cfenv": "^1.0.3",
     "composable-middleware": "^0.3.0",
@@ -20,6 +20,7 @@
     "jsonwebtoken": "^7.1.9",
     "morgan": "~1.7.0",
     "newrelic": "^1.36.2",
+    "nodemailer": "^2.7.2",
     "passport": "^0.3.2",
     "passport-facebook": "^2.1.1",
     "passport-facebook-token": "^3.3.0",

diff --git a/iOS/TogetherStream/TogetherStream/Controllers/StreamViewController.swift b/iOS/TogetherStream/TogetherStream/Controllers/StreamViewController.swift
@@ -506,18 +506,18 @@ class StreamViewController: UIViewController {
     ///
     /// - Parameter message: The message whos subject would be blocked.
     fileprivate func blockSubject(of message: Message) {
-        let alert = UIAlertController(title: "Block User", message: "Are you sure you wish to block this user? They will be removed from your friends list. This action cannot be undone.", preferredStyle: .alert)
+        let alert = UIAlertController(title: "Block User", message: "Are you sure you wish to block this user? They will be removed from your friends list and you will be removed from theirs. This action cannot be undone.", preferredStyle: .alert)
         alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
         alert.addAction(UIAlertAction(title: "Confirm", style: .destructive) {_ in
             self.viewModel.blockSubject(of: message) { error in
                 var title: String, message: String
                 if let error = error {
-                    title = "Failure"
+                    title = "Failed to Block User"
                     message = error.localizedDescription
                 }
                 else {
-                    title = "Success"
-                    message = "Blocked"
+                    title = "User Blocked"
+                    message = "User has been blocked. They will be removed from your friends list and you will be removed from theirs."
                 }
                 let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
                 alert.addAction(UIAlertAction(title: "OK", style: .default))