Skip to content

Fix: messages #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
NathanWEdwards wants to merge 1 commit into
base: production
Choose a base branch
from
Draft

Fix: messages #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions screens/message-summaries-screen/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ const MessageSummariesScreen = ({ actions, currentUser, messages, navigation, us
};
case messageTypes.REQUEST_TO_JOIN :
return () => {
const membershipId = ((message.sender || {}).email || {}).uid || "";
const membershipId = (message.sender || {}).uid || "";
const teamId = message.teamId;
actions.readMessage(message, userId);
navigation.navigate("TeamMemberDetails", { teamId, membershipId });
Expand Down Expand Up @@ -217,22 +217,22 @@ const MessageSummariesScreen = ({ actions, currentUser, messages, navigation, us
{ "To send messages, join or create a team." }
</Text>
</View>
<View styleName="horizontal" style={ { marginTop: 30 } }>
<Button
<View style={ { flexDirection: "row", marginTop: 30 } }>
<TouchableOpacity
onPress={ () => {
navigation.navigate("FindTeam");
} }
styleName="confirmation">
<Text>JOIN A TEAM</Text>
</Button>
style={ { flex: 1, backgroundColor: "#55683A", padding: 12, marginRight: 5, alignItems: "center", borderRadius: 4 } }>
<Text style={ { color: "white", fontWeight: "bold", fontFamily: "Rubik-Regular" } }>JOIN A TEAM</Text>
</TouchableOpacity>

<Button
<TouchableOpacity
onPress={ () => {
navigation.navigate("NewTeam");
} }
styleName="confirmation secondary">
<Text>CREATE A TEAM</Text>
</Button>
style={ { flex: 1, backgroundColor: "#778F4C", padding: 12, marginLeft: 5, alignItems: "center", borderRadius: 4 } }>
<Text style={ { color: "white", fontWeight: "bold", fontFamily: "Rubik-Regular" } }>CREATE A TEAM</Text>
</TouchableOpacity>
</View>
</View>
)
Expand Down