Merge pull request #4201 from withspectrum/2.4.61

2.4.61

Author: brianlovin

cypress/integration/apps_page_spec.js

@@ -0,0 +1,11 @@
+describe('Privacy View', () => {
+  describe('Loads page', () => {
+    beforeEach(() => {
+      cy.visit('/apps');
+    });
+
+    it('should render the privacy page', () => {
+      cy.get('[data-cy="apps-page"]').should('be.visible');
+    });
+  });
+});

cypress/integration/navbar_spec.js

@@ -7,6 +7,8 @@ const coreSplashPageNavbarLinksVisible = () => {
 
   cy.get('[data-cy="navbar-splash-features"]').should('be.visible');
 
+  cy.get('[data-cy="navbar-splash-apps"]').should('be.visible');
+
   cy.get('[data-cy="navbar-splash-support"]').should('be.visible');
 };
 

cypress/integration/thread/chat_input_spec.js

@@ -54,9 +54,9 @@ describe('chat input', () => {
     it('should render', () => {
       cy.get('[data-cy="thread-view"]').should('be.visible');
       cy.get('[data-cy="chat-input-send-button"]').should('not.be.visible');
-      cy
-        .get('[data-cy="thread-join-channel-upsell-button"]')
-        .should('be.visible');
+      cy.get('[data-cy="thread-join-channel-upsell-button"]').should(
+        'be.visible'
+      );
     });
   });
 
@@ -105,22 +105,19 @@ describe('chat input', () => {
     it('should allow quoting a message', () => {
       // Quote a message
       cy.get('[data-cy="staged-quoted-message"]').should('not.be.visible');
-      cy
-        .get('[data-cy="message"]')
+      cy.get('[data-cy="message"]')
         .first()
         .should('be.visible')
         .click();
-      cy
-        .get('[data-cy="reply-to-message"]')
+      cy.get('[data-cy="reply-to-message"]')
         .first()
         .should('be.visible')
         .click({ force: true });
 
       cy.get('[data-cy="staged-quoted-message"]').should('be.visible');
 
       // Remove quoted message again
-      cy
-        .get('[data-cy="remove-staged-quoted-message"]')
+      cy.get('[data-cy="remove-staged-quoted-message"]')
         .should('be.visible')
         .click();
       cy.get('[data-cy="staged-quoted-message"]').should('not.be.visible');

mobile/components/ChatInput/index.js

@@ -41,6 +41,7 @@ const ChatInputContainer = (props: Props) => {
   );
 };
 
-export default compose(withNavigation, connect(mapStateToProps))(
-  ChatInputContainer
-);
+export default compose(
+  withNavigation,
+  connect(mapStateToProps)
+)(ChatInputContainer);

mobile/components/Message/index.js

@@ -178,4 +178,8 @@ class Message extends React.Component<Props, State> {
   }
 }
 
-export default compose(connectActionSheet, toggleReaction, connect())(Message);
+export default compose(
+  connectActionSheet,
+  toggleReaction,
+  connect()
+)(Message);

mobile/components/Messages/index.js

@@ -218,4 +218,7 @@ class Messages extends Component<Props> {
   }
 }
 
-export default compose(viewNetworkHandler, withCurrentUser)(Messages);
+export default compose(
+  viewNetworkHandler,
+  withCurrentUser
+)(Messages);

mobile/components/ThreadFeed/index.js

@@ -191,4 +191,7 @@ class ThreadFeed extends Component<Props, State> {
   }
 }
 
-export default compose(withCurrentUser, ViewNetworkHandler)(ThreadFeed);
+export default compose(
+  withCurrentUser,
+  ViewNetworkHandler
+)(ThreadFeed);

mobile/components/Toasts/index.js

@@ -27,8 +27,8 @@ class Toasts extends React.Component<Props, State> {
   opacityValue = new Animated.Value(0);
   containerTimeoutTiming = 3000;
   animationDuration = 200;
-  removeToastTimeoutTiming = this.containerTimeoutTiming +
-    this.animationDuration;
+  removeToastTimeoutTiming =
+    this.containerTimeoutTiming + this.animationDuration;
   hideContainerTimeout = undefined;
 
   state = {
@@ -147,4 +147,7 @@ class Toasts extends React.Component<Props, State> {
 }
 
 const map = (state: ReduxState): * => ({ toasts: state.toasts });
-export default compose(connect(map), withTheme)(Toasts);
+export default compose(
+  connect(map),
+  withTheme
+)(Toasts);

mobile/views/Channel/JoinButton.js

@@ -95,4 +95,7 @@ class JoinButton extends React.Component<Props, State> {
   }
 }
 
-export default compose(connect(), toggleChannelSubscription)(JoinButton);
+export default compose(
+  connect(),
+  toggleChannelSubscription
+)(JoinButton);

mobile/views/Channel/index.js

@@ -42,7 +42,9 @@ const ChannelThreadFeed = compose(getChannelThreadConnection)(ThreadFeed);
 
 class Channel extends Component<Props> {
   trackView = () => {
-    const { data: { channel } } = this.props;
+    const {
+      data: { channel },
+    } = this.props;
     if (!channel) return;
     track(events.CHANNEL_VIEWED, {
       channel: transformations.analyticsChannel(channel),
@@ -51,7 +53,10 @@ class Channel extends Component<Props> {
   };
 
   setTitle = () => {
-    const { data: { channel }, navigation } = this.props;
+    const {
+      data: { channel },
+      navigation,
+    } = this.props;
     let title;
     if (channel) {
       title = channel.name;
@@ -145,4 +150,7 @@ class Channel extends Component<Props> {
   }
 }
 
-export default compose(getChannelById, ViewNetworkHandler)(Channel);
+export default compose(
+  getChannelById,
+  ViewNetworkHandler
+)(Channel);