@plusscommunities/pluss-core-app 7.0.1-beta.1 → 7.0.2-auth.0

package/src/components/PlussChatMessage.js

@@ -119,7 +119,8 @@ export default class PlussChatMessage extends React.Component {
   }
 
   renderReply() {
-    if (!this.props.currentMessage || !this.props.currentMessage.replyingTo) {
+    // Don't show reply quote for deleted messages
+    if (!this.props.currentMessage || !this.props.currentMessage.replyingTo || this.props.currentMessage.deleted) {
       return null;
     }
     return (
@@ -134,6 +135,10 @@ export default class PlussChatMessage extends React.Component {
   }
 
   renderReplyButton() {
+    // Don't show reply button for deleted messages
+    if (this.props.currentMessage.deleted) {
+      return null;
+    }
     return (
       <TouchableOpacity style={styles[this.props.position].replyContainer} onPress={this.props.onPressReply}>
         <TextStyle type="button" style={{ color: this.props.colourBrandingMain }}>
@@ -143,6 +148,20 @@ export default class PlussChatMessage extends React.Component {
     );
   }
 
+  renderDeleteButton() {
+    // Only show delete button if handler is provided and for current user's messages that aren't already deleted
+    if (!this.props.onPressDelete || !this.isCurrentUser() || this.props.currentMessage.deleted) {
+      return null;
+    }
+    return (
+      <TouchableOpacity style={styles[this.props.position].deleteContainer} onPress={this.props.onPressDelete}>
+        <TextStyle type="button" style={{ color: this.props.colourBrandingMain }}>
+          Delete
+        </TextStyle>
+      </TouchableOpacity>
+    );
+  }
+
   render() {
     const sameUserAsLast = isSameUser(this.props.currentMessage, this.props.previousMessage);
     const sameUser = isSameUser(this.props.currentMessage, this.props.nextMessage);
@@ -166,7 +185,10 @@ export default class PlussChatMessage extends React.Component {
               <View>
                 {this.renderReply()}
                 {this.renderBubble()}
-                {this.renderReplyButton()}
+                <View style={styles[this.props.position].actionButtons}>
+                  {this.renderReplyButton()}
+                  {this.renderDeleteButton()}
+                </View>
               </View>
               {this.props.position === 'right' ? this.renderAvatar() : null}
             </View>
@@ -216,6 +238,14 @@ const styles = {
     },
     replyContainer: {
       paddingLeft: 20,
+      paddingRight: 10,
+    },
+    deleteContainer: {
+      paddingLeft: 10,
+    },
+    actionButtons: {
+      flexDirection: 'row',
+      alignItems: 'center',
     },
   }),
   right: StyleSheet.create({
@@ -255,9 +285,16 @@ const styles = {
       textAlign: 'right',
     },
     replyContainer: {
-      alignSelf: 'flex-end',
       paddingRight: 10,
     },
+    deleteContainer: {
+      paddingRight: 10,
+    },
+    actionButtons: {
+      flexDirection: 'row',
+      alignItems: 'center',
+      alignSelf: 'flex-end',
+    },
   }),
 };
 

package/src/components/index.js

@@ -47,6 +47,7 @@ export { default as LoadingStateWidget } from './LoadingStateWidget';
 export { default as Header } from './Header';
 export { default as LoadingIndicator } from './LoadingIndicator';
 export { default as ImageUploader } from './ImageUploader';
+// export { default as DocumentUploader } from './DocumentUploader';
 export { default as ImageUploadProgress } from './ImageUploadProgress';
 export { default as UserListing } from './UserListing';
 export { default as PlussChat } from './PlussChat';

package/src/components/react-native-expo-image-cropper/ExpoImageManipulator.js

@@ -273,7 +273,7 @@ class ExpoImageManipulator extends Component {
                 pinchGestureEnabled={false}
               >
                 <AutoHeightImage
-                  style={{ backgroundColor: 'black' }}
+                  style={{ backgroundColor: 'black', marginTop: cropInitialTop }}
                   source={{ uri }}
                   resizeMode={imageRatio >= 1 ? 'contain' : 'contain'}
                   width={width}

package/src/config.js

@@ -18,6 +18,11 @@ const CoreConfig = {
     strings: {},
     newEventDefaults: '',
     defaultAllowComments: true,
+    AuthStrategy: {
+      getAccessToken: async () => null,
+      getCurrentUserId: async () => null,
+      hasActiveSession: async () => false,
+    },
   },
   init: (environment, navigation) => {
     CoreConfig.env = environment;

package/src/session.js

@@ -1,10 +1,10 @@
 import _ from 'lodash';
 import axios from 'axios';
 import { Auth } from 'aws-amplify';
+import Config from './config';
 
 export const getSessionTokenAWS = async prefix => {
-  const data = await Auth.currentSession();
-  const token = data.accessToken.jwtToken;
+  const token = await Config.env.AuthStrategy.getAccessToken();
   if (_.isUndefined(prefix)) return token;
   return `${prefix} ${token}`;
 };