Merge pull request #54 from bitholla/develop

v1.1.3

Author: abeikverdi

.drone.yml

@@ -12,7 +12,7 @@ steps:
 - name: slack_noti_to_releases
   image: bitholla/devops-tools:drone_partymaker-0.1.4
   environment:
-    webhook_url:
+    WEBHOOK_URL:
       from_secret: webhook_url
   when:
     status: [success]

README.md

@@ -17,13 +17,6 @@ git clone https://github.com/bitholla/hollaex-kit.git
 bash install.sh
 ```
 
-OR
-
-```
-curl -L https://raw.githubusercontent.com/bitholla/hollaex-cli/master/install.sh | bash
-
-hollaex init
-```
 Read more on our [Docs](https://docs.bitholla.com/hollaex-kit/get-started)!
 
 ## Community

version

@@ -1 +1 @@
-1.1.2
+1.1.3

web/package-lock.json

@@ -1,6 +1,6 @@
 {
-	"name": "hollaex",
-	"version": "1.20.17",
+	"name": "hollaex-kit",
+	"version": "1.20.18",
 	"private": true,
 	"dependencies": {
 		"@material/button": "^0.7.0",

web/package.json

@@ -193,17 +193,18 @@ class AppBar extends Component {
 	};
 
 	handleTheme = (selected) => {
-		const settings = {};
 		if (!isLoggedIn()) {
 			this.props.changeTheme(selected);
 			localStorage.setItem('theme', selected);
 		} else {
+			const { settings = {} } = this.props.user;
+			const settingsObj = { ...settings };
 			if (selected === 'white') {
-				settings.interface = { theme: 'white' };
+				settingsObj.interface.theme = 'white';
 			} else {
-				settings.interface = { theme: 'dark' };
+				settingsObj.interface.theme = 'dark';
 			}
-			return updateUser({ settings })
+			return updateUser({ settings: settingsObj })
 				.then(({ data }) => {
 					this.props.setUserData(data);
 					this.props.changeTheme(data.settings.interface.theme);

web/src/components/AppBar/index.js

@@ -3,7 +3,7 @@ import classnames from 'classnames';
 import moment from 'moment';
 import STRINGS from '../../config/localizedStrings';
 import TruncateMarkup from 'react-truncate-markup';
-import { ICONS, IS_XHT } from '../../config/constants';
+import { ICONS } from '../../config/constants';
 import { USER_TYPES } from '../../actions/appActions';
 import ReactSVG from 'react-svg';
 
@@ -66,15 +66,11 @@ class ChatMessageWithText extends Component {
 			ownMessage,
 			// timestamp,
 			verification_level,
-			is_hap
 		} = this.props;
 		const { maxLines } = this.state;
 		let icon = ICONS[`LEVEL_ACCOUNT_ICON_${verification_level}`]
 			? ICONS[`LEVEL_ACCOUNT_ICON_${verification_level}`]
 			: ICONS.LEVEL_ACCOUNT_ICON_4;
-		if (IS_XHT && ownMessage && is_hap) {
-			icon = ICONS.HAP_ACCOUNT_ICON;
-		}
 		return (
 			<div className={classnames('nonmobile')}>
 				<div className="d-flex">
@@ -134,16 +130,11 @@ class ChatMessageWithImage extends Component {
 			messageContent,
 			timestamp,
 			verification_level,
-			ownMessage,
-			is_hap
 		} = this.props;
 		const { hideImage } = this.state;
 		let icon = verification_level >= 4
 			? ICONS.LEVEL_ACCOUNT_ICON_4
 			: ICONS[`LEVEL_ACCOUNT_ICON_${verification_level}`];
-		if (IS_XHT && ownMessage && is_hap) {
-			icon = ICONS.HAP_ACCOUNT_ICON;
-		}
 
 		return (
 			<div>
@@ -211,7 +202,6 @@ export class ChatMessage extends Component {
 			ownMessage,
 			timestamp,
 			verification_level,
-			is_hap,
 			onCloseEmoji
 		} = this.props;
 		const { showOptions } = this.state;
@@ -239,7 +229,6 @@ export class ChatMessage extends Component {
 							messageType={messageType}
 							timestamp={timestamp}
 							verification_level={verification_level}
-							is_hap={is_hap}
 						/>
 					) : (
 						<ChatMessageWithText
@@ -249,7 +238,6 @@ export class ChatMessage extends Component {
 							ownMessage={ownMessage}
 							timestamp={timestamp}
 							verification_level={verification_level}
-							is_hap={is_hap}
 						/>
 					)}
 				</div>