Merge branch 'alpha' of github.com:withspectrum/spectrum into 3.1.1

withspectrum · Mar 28, 2019 · 5ff88d9 · 5ff88d9
2 parents 1c48967 + 4e9da16
commit 5ff88d9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/components/titlebar/actions.js b/src/components/titlebar/actions.js
@@ -12,7 +12,7 @@ import {
 } from 'src/components/button';
 import InitDirectMessageWrapper from 'src/components/initDirectMessageWrapper';
 import getComposerLink from 'src/helpers/get-composer-link';
-import JoinChannel from 'src/components/joinCommunityWrapper';
+import JoinChannel from 'src/components/joinChannelWrapper';
 import JoinCommunity from 'src/components/joinCommunityWrapper';
 import { withCurrentUser } from 'src/components/withCurrentUser';
 
@@ -77,7 +77,7 @@ export const MobileChannelAction = (props: ChannelProps) => {
 
   return (
     <JoinChannel
-      channelId={channel.id}
+      channel={channel}
       render={({ isLoading }) => (
         <PrimaryButton size={'small'} isLoading={isLoading}>
           {isLoading ? 'Joining...' : 'Join'}