merge conflicts

package.json

@@ -47,17 +47,8 @@
     "mongodb": "^3.1.1",
     "passport": "^0.4.0",
     "performance-now": "^2.1.0",
-<<<<<<< HEAD
-    "rc-tooltip": "^3.7.2",
-    "react-copy-to-clipboard": "^5.0.1",
-    "react-popper": "^1.0.0-beta.6",
-    "react-tooltip": "^3.6.1",
-    "subscriptions-transport-ws": "^0.9.11",
-    "uuid": "^3.2.1"
-=======
     "subscriptions-transport-ws": "^0.9.12",
     "uuid": "^3.3.2"
->>>>>>> abfa39529ff398007bb67cd814c4217a97bdb38b
   },
   "devDependencies": {
     "@babel/core": "7.0.0-beta.49",
@@ -148,6 +139,8 @@
     "react-responsive": "^4.1.0",
     "react-test-renderer": "^16.4.1",
     "react-timeago": "^4.1.9",
+    "react-copy-to-clipboard": "^5.0.1",
+    "react-popper": "^1.0.0-beta.6",
     "recompose": "^0.27.1",
     "relay-compiler": "github:coralproject/patched#relay-compiler",
     "relay-compiler-language-typescript": "github:coralproject/patched#relay-compiler-language-typescript",

src/core/client/stream/components/Comment/Comment.spec.tsx

@@ -6,24 +6,8 @@ import { PropTypesOf } from "talk-framework/types";
 import Comment from "./Comment";
 
 it("renders username and body", () => {
-<<<<<<< HEAD:src/core/client/stream/components/Comment.spec.tsx
-  const props = {
-    id: "id",
-    author: {
-      username: "Marvin",
-    },
-    body: "Woof",
-  };
-  const wrapper = shallow(<Comment {...props} />);
-  expect(wrapper).toMatchSnapshot();
-});
-
-it("renders with gutterBottom", () => {
-  const props = {
-    id: "id",
-=======
   const props: PropTypesOf<typeof Comment> = {
->>>>>>> abfa39529ff398007bb67cd814c4217a97bdb38b:src/core/client/stream/components/Comment/Comment.spec.tsx
+    id: "comment-ID",
     author: {
       username: "Marvin",
     },

src/core/client/stream/components/PermalinkPopover.tsx

@@ -55,11 +55,11 @@ class PermalinkPopover extends React.Component<InnerProps> {
               <CopyToClipboard text={commentId} onCopy={this.onCopy}>
                 <Button primary>
                   {copied ? (
-                    <L id="copied">
+                    <L id="comments-permalink-copied">
                       <span>Copied!</span>
                     </L>
                   ) : (
-                    <L id="copy">
+                    <L id="comments-permalink-copy">
                       <span>Copy</span>
                     </L>
                   )}
@@ -70,7 +70,7 @@ class PermalinkPopover extends React.Component<InnerProps> {
         }
       >
         <button className={styles.shareButton} onClick={this.onClick}>
-          <L id="share">
+          <L id="comments-permalink-share">
             <span>Share</span>
           </L>
         </button>

src/core/client/stream/containers/CommentContainer.tsx

@@ -2,16 +2,19 @@ import React, { StatelessComponent } from "react";
 import { graphql } from "react-relay";
 
 import withFragmentContainer from "talk-framework/lib/relay/withFragmentContainer";
-import { Omit, PropTypesOf } from "talk-framework/types";
+import { PropTypesOf } from "talk-framework/types";
 import { CommentContainer as Data } from "talk-stream/__generated__/CommentContainer.graphql";
 
-import Comment, { CommentProps } from "../components/Comment";
+import Comment from "../components/Comment";
 
-type InnerProps = { data: Data } & Omit<CommentProps, keyof Data>;
+interface InnerProps {
+  data: Data;
+}
 
 // tslint:disable-next-line:no-unused-expression
 graphql`
   fragment CommentContainer_comment on Comment {
+    id
     author {
       username
     }

src/core/client/ui/hocs/withForwardRef.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import {
   InferableComponentEnhancerWithProps,
   withPropsOnChange,

src/locales/en-US/stream.ftl

@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-postCommentForm-submit = Post
-share = Share
-copy = Copy
-copied = Copied
-=======
 ### Localization for Embed Stream
 
 ## Comments Tab
@@ -11,4 +5,7 @@ copied = Copied
 comments-postCommentForm-post = Post
 comments-stream-loadMore = Load more
 comments-replyList-showAll = Show all
->>>>>>> cac0afa61e79b19ddcae873f543a6910b83c92e7
+
+comments-permalink-share = Share
+comments-permalink-copy = Copy
+comments-permalink-copied = Copied