Chore: fixes and improvements (#237)

muhsin-k · web-flow · commit 488ada301a2a · 2020-09-19T22:00:14.000+05:30
* Change the URL validation logic

* Style fixes

* Message send issues

* Release android/ios beta version 0.0.59

* Fix the button active style issue

* Show chatwoot related links in official app only

* Fix private message styles

* Code beautification
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -134,8 +134,8 @@ android {
         applicationId "com.chatwoot.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 58
-        versionName "0.0.58"
+        versionCode 59
+        versionName "0.0.59"
         multiDexEnabled true 
     }
     splits {
diff --git a/ios/Chatwoot.xcodeproj/project.pbxproj b/ios/Chatwoot.xcodeproj/project.pbxproj
@@ -724,13 +724,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Chatwoot/Chatwoot.entitlements;
-				CURRENT_PROJECT_VERSION = 58;
+				CURRENT_PROJECT_VERSION = 59;
 				DEVELOPMENT_TEAM = 6C953F3RX2;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Chatwoot/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.0.58;
+				MARKETING_VERSION = 0.0.59;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -751,12 +751,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Chatwoot/Chatwoot.entitlements;
-				CURRENT_PROJECT_VERSION = 58;
+				CURRENT_PROJECT_VERSION = 59;
 				DEVELOPMENT_TEAM = 6C953F3RX2;
 				INFOPLIST_FILE = Chatwoot/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.0.58;
+				MARKETING_VERSION = 0.0.59;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/mobile-app",
-  "version": "0.0.58",
+  "version": "0.0.59",
   "private": true,
   "scripts": {
     "clean": "rm -rf $TMPDIR/react-* && watchman watch-del-all && npm cache clean --force",
@@ -58,7 +58,8 @@
     "redux-logger": "^3.0.6",
     "redux-persist": "^6.0.0",
     "redux-thunk": "^2.3.0",
-    "tcomb-form-native": "^0.6.20"
+    "tcomb-form-native": "^0.6.20",
+    "validator": "^13.1.1"
   },
   "devDependencies": {
     "@babel/core": "^7.8.4",
diff --git a/src/actions/conversation.js b/src/actions/conversation.js
@@ -290,6 +290,7 @@ export const sendMessage = ({ conversationId, message }) => async (dispatch) =>
       type: SEND_MESSAGE_SUCCESS,
       payload: response.data,
     });
+    dispatch(addMessageToConversation({ message: response.data }));
   } catch (error) {
     dispatch({ type: SEND_MESSAGE_ERROR, payload: error });
   }
diff --git a/src/components/ChatMessageItem.js b/src/components/ChatMessageItem.js
@@ -81,7 +81,7 @@ const styles = (theme) => ({
     color: theme['text-basic-color'],
     borderWidth: 1,
     borderColor: theme['color-border-activity'],
-    padding: 12,
+    padding: 16,
   },
   privateMessageView: {
     flexDirection: 'row',
diff --git a/src/components/ConversationItem.js b/src/components/ConversationItem.js
@@ -146,8 +146,8 @@ const styles = (theme) => ({
     paddingBottom: 12,
     backgroundColor: theme['background-basic-color-1'],
     marginVertical: 0.5,
-    borderColor: theme['color-border'],
-    borderBottomWidth: 0,
+    borderColor: theme['item-border-color'],
+    borderBottomWidth: 1,
   },
   itemView: {
     flexDirection: 'row',
diff --git a/src/helpers/formHelper.js b/src/helpers/formHelper.js
@@ -1,10 +1,9 @@
 import t from 'tcomb-form-native';
-
+import validator from 'validator';
 // eslint-disable-next-line no-useless-escape
 const emailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 const nameRegex = /^.{2}/;
 const passwordRegex = /^.{6}/;
-const urlRegex = /^(?:(http|https):\/\/)?(?:[\w-]+\.)+[a-z]{2,6}$/;
 const mobileNumberValidator = (mobileNumber) => {
   const regex = /^(?:(?:\+|0{0,2})91(\s*[-]\s*)?|[0]?)?[789]\d{9}$/g;
   return regex.test(mobileNumber);
@@ -24,18 +23,15 @@ export const isStringName = (name) => {
 export const Name = t.refinement(t.String, (name) => isStringName(name));
 
 export const isStringUrl = (url) => {
-  const re = urlRegex;
-  return re.test(url);
+  return validator.isURL(url);
 };
 export const URL = t.refinement(t.String, (url) => isStringUrl(url));
 
 export const isStringPassword = (password) => {
   const re = passwordRegex;
   return re.test(password);
 };
-export const Password = t.refinement(t.String, (password) =>
-  isStringPassword(password),
-);
+export const Password = t.refinement(t.String, (password) => isStringPassword(password));
 
 export const isNumberValid = (number) => {
   const regex = /^\+?\d{1,8}(?:\.\d{1,2})?$/;
diff --git a/src/screens/ChatScreen/ChatScreen.style.js b/src/screens/ChatScreen/ChatScreen.style.js
@@ -27,7 +27,8 @@ const styles = (theme) => ({
   subHeaderTitle: {
     fontSize: theme['font-size-extra-small'],
     color: theme['color-gray'],
-    paddingTop: 1,
+    paddingTop: 4,
+    paddingLeft: 4,
   },
 
   container: {
diff --git a/src/screens/LoginScreen/LoginScreen.js b/src/screens/LoginScreen/LoginScreen.js
@@ -7,6 +7,7 @@ import PropTypes from 'prop-types';
 
 import { doLogin, resetAuth } from '../../actions/auth';
 
+import DeviceInfo from 'react-native-device-info';
 import styles from './LoginScreen.style';
 import { Email, Password } from '../../helpers/formHelper';
 import TextInputField from '../../components/TextInputField';
@@ -26,6 +27,8 @@ const LoginForm = t.struct({
   password: Password,
 });
 
+const appName = DeviceInfo.getApplicationName();
+
 const propTypes = {
   eva: PropTypes.shape({
     style: PropTypes.object,
@@ -144,10 +147,18 @@ const LoginScreenComponent = ({ navigation, eva }) => {
 
           <View>
             <View style={style.accountView}>
-              <TouchableOpacity onPress={() => openURL({ URL: `${installationUrl}${SIGNUP_URL}` })}>
-                <CustomText style={style.textStyle}>{i18n.t('LOGIN.CREATE_ACCOUNT')}</CustomText>
-              </TouchableOpacity>
-              <CustomText style={style.textStyle}>{'   |   '}</CustomText>
+              {appName === 'Chatwoot' && (
+                <>
+                  <TouchableOpacity
+                    onPress={() => openURL({ URL: `${installationUrl}${SIGNUP_URL}` })}>
+                    <CustomText style={style.textStyle}>
+                      {i18n.t('LOGIN.CREATE_ACCOUNT')}
+                    </CustomText>
+                  </TouchableOpacity>
+                  <CustomText style={style.textStyle}>{'   |   '}</CustomText>
+                </>
+              )}
+
               <TouchableOpacity onPress={() => navigate('ConfigureURL')}>
                 <CustomText style={style.textStyle}> {i18n.t('LOGIN.CHANGE_URL')}</CustomText>
               </TouchableOpacity>
diff --git a/src/screens/Settings/SettingsScreen.js b/src/screens/Settings/SettingsScreen.js
@@ -3,6 +3,7 @@ import { withStyles } from '@ui-kitten/components';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import { SafeAreaView } from 'react-native';
+import DeviceInfo from 'react-native-device-info';
 
 import { View, Image } from 'react-native';
 import packageFile from '../../../package.json';
@@ -23,6 +24,8 @@ import HeaderBar from '../../components/HeaderBar';
 
 import { getNotificationSettings } from '../../actions/settings';
 
+const appName = DeviceInfo.getApplicationName();
+
 const settingsData = [
   {
     text: 'SWITCH_ACCOUNT',
@@ -138,11 +141,14 @@ class SettingsComponent extends Component {
     } = this.props;
 
     // Show  switch account option only if number of accounts is greater than one
-    const settingsMenu =
+    let settingsMenu =
       accounts && accounts.length > 1
         ? settingsData
         : settingsData.filter((e) => e.itemName !== 'switch-account');
 
+    settingsMenu =
+      appName === 'Chatwoot' ? settingsData : settingsData.filter((e) => e.itemName !== 'help');
+
     return (
       <SafeAreaView style={style.container}>
         <HeaderBar title={i18n.t('SETTINGS.HEADER_TITLE')} />
diff --git a/src/theme.js b/src/theme.js
@@ -5,7 +5,8 @@ export const theme = {
   'color-primary-default': '#1F93FF',
 
   'color-basic-transparent-300': '$color-primary-500',
-
+  'color-primary-focus': '$color-primary-default',
+  'color-primary-active': '$color-primary-default',
   'color-primary-100': '#D2F2FF',
   'color-primary-200': '#A5E1FF',
   'color-primary-300': '#78CCFF',
@@ -92,6 +93,7 @@ export const theme = {
   'color-background-activity': '#fff3d5',
   'color-border-activity': '#ffe5a2',
   'color-message-left': '#3c4858',
+  'item-border-color': '#f0f4f5',
   'color-gray': '#6e6f73',
   'color-background-inbox': '#ebf5ff',
 
diff --git a/yarn.lock b/yarn.lock
@@ -9030,6 +9030,11 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+validator@^13.1.1:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.1.1.tgz#f8811368473d2173a9d8611572b58c5783f223bf"
+  integrity sha512-8GfPiwzzRoWTg7OV1zva1KvrSemuMkv07MA9TTl91hfhe+wKrsrgVN4H2QSFd/U/FhiU3iWPYVgvbsOGwhyFWw==
+
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"

Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,7 @@ export const sendMessage = ({ conversationId, message }) => async (dispatch) =>`
`290`	`290`	`type: SEND_MESSAGE_SUCCESS,`
`291`	`291`	`payload: response.data,`
`292`	`292`	`});`
	`293`	`+ dispatch(addMessageToConversation({ message: response.data }));`
`293`	`294`	`} catch (error) {`
`294`	`295`	`dispatch({ type: SEND_MESSAGE_ERROR, payload: error });`
`295`	`296`	`}`