diff --git a/apps/comments-ui/src/components/CommentsBox.js b/apps/comments-ui/src/components/CommentsBox.js
index fbf4fd0060..c3fbc43a92 100644
--- a/apps/comments-ui/src/components/CommentsBox.js
+++ b/apps/comments-ui/src/components/CommentsBox.js
@@ -5,6 +5,7 @@ import Form from './Form';
import Comment from './Comment';
import Pagination from './Pagination';
import NotPaidBox from './NotPaidBox';
+import Empty from './Empty';
const CommentsBox = (props) => {
const luminance = (r, g, b) => {
@@ -57,10 +58,10 @@ const CommentsBox = (props) => {
- {commentsElements}
+ {commentsCount === 0 ? : commentsElements}
- { member ? (isPaidMember || !paidOnly ? : ) : }
+ { member ? (isPaidMember || !paidOnly ? : ) : }
);
diff --git a/apps/comments-ui/src/components/Empty.js b/apps/comments-ui/src/components/Empty.js
new file mode 100644
index 0000000000..b12277702a
--- /dev/null
+++ b/apps/comments-ui/src/components/Empty.js
@@ -0,0 +1,11 @@
+import React from 'react';
+
+const Empty = (props) => {
+ return (
+
+ There are currently no comments.
+
+ );
+};
+
+export default Empty;
diff --git a/apps/comments-ui/src/components/NotPaidBox.js b/apps/comments-ui/src/components/NotPaidBox.js
index c4b12e10ac..092297af6d 100644
--- a/apps/comments-ui/src/components/NotPaidBox.js
+++ b/apps/comments-ui/src/components/NotPaidBox.js
@@ -12,9 +12,11 @@ const NotPaidBox = (props) => {
color: accentColor
};
+ const titleText = (props.isFirst ? 'Want to be the first to comment?' : 'Want to join the discussion?');
+
return (
- Want to join the discussion?
+ {titleText}
Subscribe now
diff --git a/apps/comments-ui/src/components/NotSignedInBox.js b/apps/comments-ui/src/components/NotSignedInBox.js
index 16c7846227..803f46d289 100644
--- a/apps/comments-ui/src/components/NotSignedInBox.js
+++ b/apps/comments-ui/src/components/NotSignedInBox.js
@@ -12,9 +12,11 @@ const NotSignedInBox = (props) => {
color: accentColor
};
+ const titleText = (props.isFirst ? 'Want to be the first to comment?' : 'Want to join the discussion?');
+
return (