Merge remote-tracking branch 'origin/2.1.4' into development

features/block.feature

@@ -13,6 +13,7 @@ Feature: Block page
       | Total Amount  | 100,000,000 LSK            |
       | Timestamp     | /2016\/05\/24 \d\d:00:00/  |
       | Generated by  | 1085993630748340485L       |
+      | Version       | 0                          |
     And I should see table "transactions" with 50 rows starting with:
       | Transaction ID       | Date                      | Sender            | Recipient             | Amount | Fee   | Confirm.      |
       |----------------------|---------------------------|-------------------|-----------------------|--------|-------|---------------|

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lisk-explorer",
-  "version": "2.1.4-rc",
+  "version": "2.1.4",
   "description": "Lisk blockchain explorer",
   "keywords": [
     "lisk",

services/newsfeed/TwitterService.js

@@ -24,13 +24,22 @@ const client = new Twitter({
 	access_token_secret: process.env.TWITTER_ACCESS_TOKEN_SECRET,
 });
 
+const safeRef = (obj, path) => {
+	try {
+		// eslint-disable-next-line
+		return path.split('.').reduce((xs, x) => (xs && xs[x]) ? xs[x] : null, obj);
+	} catch (e) {
+		return null;
+	}
+};
+
 const tweetUrl = (o) => {
 	if (o.retweeted_status) {
-		return o.retweeted_status.entities.urls[0].url;
+		return safeRef(o, 'retweeted_status.entities.urls.0.url');
 	} else if (o.extended_entities) {
-		return o.extended_entities.media[0].url;
+		return safeRef(o, 'extended_entities.media.0.url');
 	} else if (o.entities) {
-		return o.entities.urls[0].url;
+		return safeRef(o, 'entities.urls.0.url');
 	}
 	return null;
 };

src/components/blocks/block.html

@@ -80,6 +80,10 @@ <h1>
 									<a data-account-href="vm.block.delegate">{{vm.block.delegate.username || vm.block.generatorId}}</a>
 								</td>
 							</tr>
+							<tr>
+								<td class='left-padding-xs left-padding-s left-padding-m left-padding-l double'><strong>Version</strong></td>
+								<td class="right-padding-xs right-padding-s right-padding-m right-padding-l double text-right">{{vm.block.version}}</td>
+							</tr>
 						</tbody>
 					</table>
 				</div>