Merge pull request #1404 from Kommunicate-io/master-14.2.1

Master 14.2.1

Author: panwaranuj01

amplify.yml

@@ -19,16 +19,16 @@ frontend:
                 - if [ "${BUILD_ENV}" = "staging" ]; then npm run build-staging; fi
                 # Kommunicate Prod
                 - if [ "${BUILD_ENV}" = "prod" ]; then npm run build-prod; fi
-                 # Kommunicate Enterprise
+                  # Kommunicate Enterprise
                 - if [ "${BUILD_ENV}" = "prod-enterprise" ]; then npm run build-prod-enterprise; fi
                 # Kommunicate Prod Mumbai
                 - if [ "${BUILD_ENV}" = "prod-in" ]; then npm run build-prod-in; fi
                 # Kommunicate Prod Europe
                 - if [ "${BUILD_ENV}" = "prod-eu" ]; then npm run build-prod-eu; fi
                 # Kommunicate Prod Canada
                 - if [ "${BUILD_ENV}" = "prod-cn" ]; then npm run build-prod-cn; fi
-                # Kommunicate beta 
-                - if [ "${BUILD_ENV}" = "prod_beta" ]; then npm run build-beta; fi
+                # Kommunicate beta
+                - if [ "${BUILD_ENV}" = "prod-beta" ]; then npm run build-beta; fi
                 # If no environment variable is provided then build kommunicate test bundle.
                 - if [ "${BUILD_ENV}" = "" ]; then npm run build-test; fi
     artifacts:

package-lock.json

@@ -34,6 +34,7 @@ exports.THIRD_PARTY_SCRIPTS = [
 ];
 
 exports.PLUGIN_JS_FILES = [
+    path.resolve(__dirname, 'template/mck-icons.js'),
     path.resolve(__dirname, 'js/app/components/custom-element.js'),
     path.resolve(__dirname, 'lib/js/jquery.linkify.js'),
     path.resolve(__dirname, 'js/app/constants/km-allowed-tags.js'),
@@ -78,7 +79,6 @@ exports.PLUGIN_CSS_FILES = [
     path.resolve(__dirname, 'css/app/mck-sidebox-1.0.css'),
     path.resolve(__dirname, 'css/app/km-voice-note.css'),
     path.resolve(__dirname, 'css/app/km-rich-message.css'),
-    // path.resolve(__dirname, 'css/app/km-login-model.css'),
     path.resolve(__dirname, 'lib/css/tiny-slider-2.9.2.css'),
     path.resolve(__dirname, 'css/app/km-sidebox.css'),
     // path.resolve(__dirname, 'lib/css/intl-tel-lib.css'),
@@ -176,6 +176,10 @@ function getCurrentBranch() {
             return process.env.AWS_BRANCH;
         }
 
+        if (process.env.BRANCH) {
+            return process.env.BRANCH;
+        }
+
         if (process.env.NODE_ENV != 'development') {
             return version;
         }