diff --git a/.currentLang = 2 b/.currentLang = 2
deleted file mode 100644
index c07548c0..00000000
--- a/.currentLang = 2	
+++ /dev/null
@@ -1,224 +0,0 @@
-
-                   SSUUMMMMAARRYY OOFF LLEESSSS CCOOMMMMAANNDDSS
-
-      Commands marked with * may be preceded by a number, _N.
-      Notes in parentheses indicate the behavior if _N is given.
-      A key preceded by a caret indicates the Ctrl key; thus ^K is ctrl-K.
-
-  h  H                 Display this help.
-  q  :q  Q  :Q  ZZ     Exit.
- ---------------------------------------------------------------------------
-
-                           MMOOVVIINNGG
-
-  e  ^E  j  ^N  CR  *  Forward  one line   (or _N lines).
-  y  ^Y  k  ^K  ^P  *  Backward one line   (or _N lines).
-  f  ^F  ^V  SPACE  *  Forward  one window (or _N lines).
-  b  ^B  ESC-v      *  Backward one window (or _N lines).
-  z                 *  Forward  one window (and set window to _N).
-  w                 *  Backward one window (and set window to _N).
-  ESC-SPACE         *  Forward  one window, but don't stop at end-of-file.
-  d  ^D             *  Forward  one half-window (and set half-window to _N).
-  u  ^U             *  Backward one half-window (and set half-window to _N).
-  ESC-)  RightArrow *  Right one half screen width (or _N positions).
-  ESC-(  LeftArrow  *  Left  one half screen width (or _N positions).
-  ESC-}  ^RightArrow   Right to last column displayed.
-  ESC-{  ^LeftArrow    Left  to first column.
-  F                    Forward forever; like "tail -f".
-  ESC-F                Like F but stop when search pattern is found.
-  r  ^R  ^L            Repaint screen.
-  R                    Repaint screen, discarding buffered input.
-        ---------------------------------------------------
-        Default "window" is the screen height.
-        Default "half-window" is half of the screen height.
- ---------------------------------------------------------------------------
-
-                          SSEEAARRCCHHIINNGG
-
-  /_p_a_t_t_e_r_n          *  Search forward for (_N-th) matching line.
-  ?_p_a_t_t_e_r_n          *  Search backward for (_N-th) matching line.
-  n                 *  Repeat previous search (for _N-th occurrence).
-  N                 *  Repeat previous search in reverse direction.
-  ESC-n             *  Repeat previous search, spanning files.
-  ESC-N             *  Repeat previous search, reverse dir. & spanning files.
-  ESC-u                Undo (toggle) search highlighting.
-  &_p_a_t_t_e_r_n          *  Display only matching lines
-        ---------------------------------------------------
-        A search pattern may begin with one or more of:
-        ^N or !  Search for NON-matching lines.
-        ^E or *  Search multiple files (pass thru END OF FILE).
-        ^F or @  Start search at FIRST file (for /) or last file (for ?).
-        ^K       Highlight matches, but don't move (KEEP position).
-        ^R       Don't use REGULAR EXPRESSIONS.
- ---------------------------------------------------------------------------
-
-                           JJUUMMPPIINNGG
-
-  g  <  ESC-<       *  Go to first line in file (or line _N).
-  G  >  ESC->       *  Go to last line in file (or line _N).
-  p  %              *  Go to beginning of file (or _N percent into file).
-  t                 *  Go to the (_N-th) next tag.
-  T                 *  Go to the (_N-th) previous tag.
-  {  (  [           *  Find close bracket } ) ].
-  }  )  ]           *  Find open bracket { ( [.
-  ESC-^F _<_c_1_> _<_c_2_>  *  Find close bracket _<_c_2_>.
-  ESC-^B _<_c_1_> _<_c_2_>  *  Find open bracket _<_c_1_> 
-        ---------------------------------------------------
-        Each "find close bracket" command goes forward to the close bracket 
-          matching the (_N-th) open bracket in the top line.
-        Each "find open bracket" command goes backward to the open bracket 
-          matching the (_N-th) close bracket in the bottom line.
-
-  m_<_l_e_t_t_e_r_>            Mark the current top line with <letter>.
-  M_<_l_e_t_t_e_r_>            Mark the current bottom line with <letter>.
-  '_<_l_e_t_t_e_r_>            Go to a previously marked position.
-  ''                   Go to the previous position.
-  ^X^X                 Same as '.
-  ESC-M_<_l_e_t_t_e_r_>        Clear a mark.
-        ---------------------------------------------------
-        A mark is any upper-case or lower-case letter.
-        Certain marks are predefined:
-             ^  means  beginning of the file
-             $  means  end of the file
- ---------------------------------------------------------------------------
-
-                        CCHHAANNGGIINNGG FFIILLEESS
-
-  :e [_f_i_l_e]            Examine a new file.
-  ^X^V                 Same as :e.
-  :n                *  Examine the (_N-th) next file from the command line.
-  :p                *  Examine the (_N-th) previous file from the command line.
-  :x                *  Examine the first (or _N-th) file from the command line.
-  :d                   Delete the current file from the command line list.
-  =  ^G  :f            Print current file name.
- ---------------------------------------------------------------------------
-
-                    MMIISSCCEELLLLAANNEEOOUUSS CCOOMMMMAANNDDSS
-
-  -_<_f_l_a_g_>              Toggle a command line option [see OPTIONS below].
-  --_<_n_a_m_e_>             Toggle a command line option, by name.
-  __<_f_l_a_g_>              Display the setting of a command line option.
-  ___<_n_a_m_e_>             Display the setting of an option, by name.
-  +_c_m_d                 Execute the less cmd each time a new file is examined.
-
-  !_c_o_m_m_a_n_d             Execute the shell command with $SHELL.
-  |XX_c_o_m_m_a_n_d            Pipe file between current pos & mark XX to shell command.
-  s _f_i_l_e               Save input to a file.
-  v                    Edit the current file with $VISUAL or $EDITOR.
-  V                    Print version number of "less".
- ---------------------------------------------------------------------------
-
-                           OOPPTTIIOONNSS
-
-        Most options may be changed either on the command line,
-        or from within less by using the - or -- command.
-        Options may be given in one of two forms: either a single
-        character preceded by a -, or a name preceded by --.
-
-  -?  ........  --help
-                  Display help (from command line).
-  -a  ........  --search-skip-screen
-                  Search skips current screen.
-  -A  ........  --SEARCH-SKIP-SCREEN
-                  Search starts just after target line.
-  -b [_N]  ....  --buffers=[_N]
-                  Number of buffers.
-  -B  ........  --auto-buffers
-                  Don't automatically allocate buffers for pipes.
-  -c  ........  --clear-screen
-                  Repaint by clearing rather than scrolling.
-  -d  ........  --dumb
-                  Dumb terminal.
-  -D [_x_n_._n]  .  --color=_x_n_._n
-                  Set screen colors. (MS-DOS only)
-  -e  -E  ....  --quit-at-eof  --QUIT-AT-EOF
-                  Quit at end of file.
-  -f  ........  --force
-                  Force open non-regular files.
-  -F  ........  --quit-if-one-screen
-                  Quit if entire file fits on first screen.
-  -g  ........  --hilite-search
-                  Highlight only last match for searches.
-  -G  ........  --HILITE-SEARCH
-                  Don't highlight any matches for searches.
-  -h [_N]  ....  --max-back-scroll=[_N]
-                  Backward scroll limit.
-  -i  ........  --ignore-case
-                  Ignore case in searches that do not contain uppercase.
-  -I  ........  --IGNORE-CASE
-                  Ignore case in all searches.
-  -j [_N]  ....  --jump-target=[_N]
-                  Screen position of target lines.
-  -J  ........  --status-column
-                  Display a status column at left edge of screen.
-  -k [_f_i_l_e]  .  --lesskey-file=[_f_i_l_e]
-                  Use a lesskey file.
-  -K  ........  --quit-on-intr
-                  Exit less in response to ctrl-C.
-  -L  ........  --no-lessopen
-                  Ignore the LESSOPEN environment variable.
-  -m  -M  ....  --long-prompt  --LONG-PROMPT
-                  Set prompt style.
-  -n  -N  ....  --line-numbers  --LINE-NUMBERS
-                  Don't use line numbers.
-  -o [_f_i_l_e]  .  --log-file=[_f_i_l_e]
-                  Copy to log file (standard input only).
-  -O [_f_i_l_e]  .  --LOG-FILE=[_f_i_l_e]
-                  Copy to log file (unconditionally overwrite).
-  -p [_p_a_t_t_e_r_n]  --pattern=[_p_a_t_t_e_r_n]
-                  Start at pattern (from command line).
-  -P [_p_r_o_m_p_t]   --prompt=[_p_r_o_m_p_t]
-                  Define new prompt.
-  -q  -Q  ....  --quiet  --QUIET  --silent --SILENT
-                  Quiet the terminal bell.
-  -r  -R  ....  --raw-control-chars  --RAW-CONTROL-CHARS
-                  Output "raw" control characters.
-  -s  ........  --squeeze-blank-lines
-                  Squeeze multiple blank lines.
-  -S  ........  --chop-long-lines
-                  Chop (truncate) long lines rather than wrapping.
-  -t [_t_a_g]  ..  --tag=[_t_a_g]
-                  Find a tag.
-  -T [_t_a_g_s_f_i_l_e] --tag-file=[_t_a_g_s_f_i_l_e]
-                  Use an alternate tags file.
-  -u  -U  ....  --underline-special  --UNDERLINE-SPECIAL
-                  Change handling of backspaces.
-  -V  ........  --version
-                  Display the version number of "less".
-  -w  ........  --hilite-unread
-                  Highlight first new line after forward-screen.
-  -W  ........  --HILITE-UNREAD
-                  Highlight first new line after any forward movement.
-  -x [_N[,...]]  --tabs=[_N[,...]]
-                  Set tab stops.
-  -X  ........  --no-init
-                  Don't use termcap init/deinit strings.
-  -y [_N]  ....  --max-forw-scroll=[_N]
-                  Forward scroll limit.
-  -z [_N]  ....  --window=[_N]
-                  Set size of window.
-  -" [_c[_c]]  .  --quotes=[_c[_c]]
-                  Set shell quote characters.
-  -~  ........  --tilde
-                  Don't display tildes after end of file.
-  -# [_N]  ....  --shift=[_N]
-                  Horizontal scroll amount (0 = one half screen width)
-                --follow-name
-                  The F command changes files if the input file is renamed.
-                --mouse
-                  Enable mouse input.
-                --no-keypad
-                  Don't send termcap keypad init/deinit strings.
-                --no-histdups
-                  Remove duplicates from command history.
-                --rscroll=C
-                  Set the character used to mark truncated lines.
-                --save-marks
-                  Retain marks across invocations of less.
-                --use-backslash
-                  Subsequent options use backslash as escape char.
-                --wheel-lines=N
-                  Each click of the mouse wheel moves N lines.
-
-
- ---------------------------------------------------------------------------
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/package.json b/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/package.json
deleted file mode 100644
index 36d3264c..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "com.huawei.cordovahmsgmscheckplugin",
-  "version": "1.0.0",
-  "description": "Account Check Kit 4.0",
-  "cordova": {
-    "id": "com.huawei.cordovahmsgmscheckplugin",
-    "platforms": [
-      "android"
-    ]
-  },
-  "keywords": [
-    "ecosystem:cordova",
-    "cordova-android"
-  ],
-  "author": "",
-  "license": "ISC"
-}
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/plugin.xml b/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/plugin.xml
deleted file mode 100644
index 63d1d203..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<plugin id="com.huawei.cordovahmsgmscheckplugin" version="1.0.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
-    <name>CordovaHMSGMSCheckPlugin</name>
-    <js-module name="CordovaHMSGMSCheckPlugin" src="www/CordovaHMSGMSCheckPlugin.js">
-        <clobbers target="cordova.plugins.CordovaHMSGMSCheckPlugin" />
-    </js-module>
-    <platform name="android">
-        <!-- hook for add maven repositories and agc plugin-->
-        <hook src="scripts/android/after_plugin_install.js" type="after_plugin_install" />
-        <hook src="scripts/android/before_plugin_uninstall.js" type="before_plugin_uninstall" />
-
-        <framework custom="true" src="src/android/build.gradle" type="gradleReference" />
-        <!-- Account Kit dependency-->
-        <framework src="com.huawei.hms:base:5.0.4.301" />
-        <!-- <framework src="com.google.android.gms:play-services-base:17.2.1" /> -->
-        
-        <config-file parent="/*" target="res/xml/config.xml">
-            <feature name="CordovaHMSGMSCheckPlugin">
-                <param name="android-package"
-                    value="com.huawei.cordovahmsgmscheckplugin.CordovaHMSGMSCheckPlugin" />
-            </feature>
-        </config-file>
-        <config-file parent="/*" target="AndroidManifest.xml"></config-file>
-        <source-file src="src/android/CordovaHMSGMSCheckPlugin.java"
-            target-dir="src/com/huawei/cordovahmsgmscheckplugin" />
-    </platform>
-    <!-- Script help to copy agconnect-services.json to right places-->
-    <hook src="scripts/after_prepare.js" type="after_prepare" />
-</plugin>
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/scripts/after_prepare.js b/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/scripts/after_prepare.js
deleted file mode 100644
index b3da28cf..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/scripts/after_prepare.js
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env node
-
-"use strict";
-
-/**
- * This hook makes sure projects using [cordova-plugin-firebase](https://github.com/arnesson/cordova-plugin-firebase)
- * will build properly and have the required key files copied to the proper destinations when the app is build on Ionic Cloud using the package command.
- * Credits: https://github.com/arnesson.
- */
-var fs = require("fs");
-var path = require("path");
-var utilities = require("./lib/utilities");
-
-var config = fs.readFileSync("config.xml").toString();
-var name = utilities.getValue(config, "name");
-
-var ANDROID_DIR = "platforms/android";
-
-var PLATFORM = {
-  ANDROID: {
-    dest: [ANDROID_DIR + "/app/agconnect-services.json"],
-    src: ["agconnect-services.json"],
-  },
-};
-
-module.exports = function (context) {
-  //get platform from the context supplied by cordova
-  var platforms = context.opts.platforms;
-  // Copy key files to their platform specific folders
-  if (
-    platforms.indexOf("android") !== -1 &&
-    utilities.directoryExists(ANDROID_DIR)
-  ) {
-    console.log("Preparing HMS GMS Check Kit on Android");
-    // utilities.copyKey(PLATFORM.ANDROID);
-  }
-};
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/scripts/android/after_plugin_install.js b/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/scripts/android/after_plugin_install.js
deleted file mode 100644
index 09e73419..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/scripts/android/after_plugin_install.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var helper = require('./helper');
-
-module.exports = function(context) {
-
-    // Modify the Gradle build file to add a task that will upload the debug symbols
-    // at build time.
-    helper.restoreRootBuildGradle();
-    helper.modifyRootBuildGradle();
-};
\ No newline at end of file
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/scripts/android/before_plugin_uninstall.js b/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/scripts/android/before_plugin_uninstall.js
deleted file mode 100644
index 9c32e552..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/scripts/android/before_plugin_uninstall.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var helper = require('./helper');
-
-module.exports = function(context) {
-
-    // Remove the Gradle modifications that were added when the plugin was installed.
-    helper.restoreRootBuildGradle();
-};
\ No newline at end of file
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/scripts/android/helper.js b/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/scripts/android/helper.js
deleted file mode 100644
index cd4b8111..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/scripts/android/helper.js
+++ /dev/null
@@ -1,131 +0,0 @@
-var fs = require("fs");
-var path = require("path");
-
-function rootBuildGradleExists() {
-  var target = path.join("platforms", "android", "build.gradle");
-  return fs.existsSync(target);
-}
-
-/*
- * Helper function to read the build.gradle that sits at the root of the project
- */
-function readRootBuildGradle() {
-  var target = path.join("platforms", "android", "build.gradle");
-  return fs.readFileSync(target, "utf-8");
-}
-
-/*
- * Added a dependency on 'com.google.gms' based on the position of the know 'com.android.tools.build' dependency in the build.gradle
- */
-function addDependencies(buildGradle) {
-  // find the known line to match
-  var match = buildGradle.match(
-    /^(\s*)classpath 'com.android.tools.build(.*)/m
-  );
-  var whitespace = match[1];
-
-  // modify the line to add the necessary dependencies
-  var agcDependency =
-    whitespace + "classpath 'com.huawei.agconnect:agcp:1.2.0.300'";
-
-  var modifiedLine = match[0] + "\n" + agcDependency;
-
-  // modify the actual line
-  return buildGradle.replace(
-    /^(\s*)classpath 'com.android.tools.build(.*)/m,
-    modifiedLine
-  );
-}
-
-/*
- * Add 'google()' and Crashlytics to the repository repo list
- */
-function addRepos(buildGradle) {
-  // find the known line to match
-  var match = buildGradle.match(/^(\s*)jcenter\(\)/m);
-  var whitespace = match[1];
-
-  // modify the line to add the necessary repo
-  var huaweiMavenRepo =
-    whitespace + "maven { url 'http://developer.huawei.com/repo/' }";
-  var modifiedLine = match[0] + "\n" + huaweiMavenRepo;
-
-  // modify the actual line
-  buildGradle = buildGradle.replace(/^(\s*)jcenter\(\)/m, modifiedLine);
-
-  // update the all projects grouping
-  var allProjectsIndex = buildGradle.indexOf("allprojects");
-  if (allProjectsIndex > 0) {
-    // split the string on allprojects because jcenter is in both groups and we need to modify the 2nd instance
-    var firstHalfOfFile = buildGradle.substring(0, allProjectsIndex);
-    var secondHalfOfFile = buildGradle.substring(allProjectsIndex);
-
-    // Add google() to the allprojects section of the string
-    match = secondHalfOfFile.match(/^(\s*)jcenter\(\)/m);
-    var huaweiMavenRepo =
-      whitespace + "maven { url 'http://developer.huawei.com/repo/' }";
-    modifiedLine = match[0] + "\n" + huaweiMavenRepo;
-    // modify the part of the string that is after 'allprojects'
-    secondHalfOfFile = secondHalfOfFile.replace(
-      /^(\s*)jcenter\(\)/m,
-      modifiedLine
-    );
-
-    // recombine the modified line
-    buildGradle = firstHalfOfFile + secondHalfOfFile;
-  } else {
-    // this should not happen, but if it does, we should try to add the dependency to the buildscript
-    match = buildGradle.match(/^(\s*)jcenter\(\)/m);
-    var huaweiMavenRepo =
-      whitespace + "maven { url 'http://developer.huawei.com/repo/' }";
-    modifiedLine = match[0] + "\n" + huaweiMavenRepo;
-    // modify the part of the string that is after 'allprojects'
-    buildGradle = buildGradle.replace(/^(\s*)jcenter\(\)/m, modifiedLine);
-  }
-
-  return buildGradle;
-}
-
-/*
- * Helper function to write to the build.gradle that sits at the root of the project
- */
-function writeRootBuildGradle(contents) {
-  var target = path.join("platforms", "android", "build.gradle");
-  fs.writeFileSync(target, contents);
-}
-
-module.exports = {
-  modifyRootBuildGradle: function () {
-    // be defensive and don't crash if the file doesn't exist
-    if (!rootBuildGradleExists) {
-      return;
-    }
-
-    var buildGradle = readRootBuildGradle();
-
-    // Add Google Play Services Dependency
-    buildGradle = addDependencies(buildGradle);
-
-    // Add Google's Maven Repo
-    buildGradle = addRepos(buildGradle);
-
-    writeRootBuildGradle(buildGradle);
-  },
-
-  restoreRootBuildGradle: function () {
-    // be defensive and don't crash if the file doesn't exist
-    if (!rootBuildGradleExists) {
-      return;
-    }
-
-    var buildGradle = readRootBuildGradle();
-
-    // remove any lines we added
-    buildGradle = buildGradle.replace(
-      /(?:^|\r?\n)(.*)com.huawei.cordovahmsgmscheckplugin*?(?=$|\r?\n)/g,
-      ""
-    );
-
-    writeRootBuildGradle(buildGradle);
-  },
-};
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/scripts/lib/utilities.js b/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/scripts/lib/utilities.js
deleted file mode 100644
index 89ecc01f..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/scripts/lib/utilities.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Utilities and shared functionality for the build hooks.
- */
-var fs = require("fs");
-var path = require("path");
-
-fs.ensureDirSync = function (dir) {
-  if (!fs.existsSync(dir)) {
-    dir.split(path.sep).reduce(function (currentPath, folder) {
-      currentPath += folder + path.sep;
-      if (!fs.existsSync(currentPath)) {
-        fs.mkdirSync(currentPath);
-      }
-      return currentPath;
-    }, "");
-  }
-};
-
-module.exports = {
-  /**
-   * Used to get the name of the application as defined in the config.xml.
-   *
-   * @param {object} context - The Cordova context.
-   * @returns {string} The value of the name element in config.xml.
-   */
-  getAppName: function (context) {
-    var ConfigParser = context.requireCordovaModule("cordova-lib").configparser;
-    var config = new ConfigParser("config.xml");
-    return config.name();
-  },
-
-  /**
-   * The ID of the plugin; this should match the ID in plugin.xml.
-   */
-  getPluginId: function () {
-    return "com.huawei.cordovahmsgmscheckplugin";
-  },
-
-  copyKey: function (platform) {
-    for (var i = 0; i < platform.src.length; i++) {
-      var file = platform.src[i];
-      if (this.fileExists(file)) {
-        try {
-          var contents = fs.readFileSync(file).toString();
-
-          try {
-            platform.dest.forEach(function (destinationPath) {
-              var folder = destinationPath.substring(
-                0,
-                destinationPath.lastIndexOf("/")
-              );
-              fs.ensureDirSync(folder);
-              fs.writeFileSync(destinationPath, contents);
-            });
-          } catch (e) {
-            // skip
-          }
-        } catch (err) {
-          console.log(err);
-        }
-
-        break;
-      }
-    }
-  },
-
-  getValue: function (config, name) {
-    var value = config.match(
-      new RegExp("<" + name + "(.*?)>(.*?)</" + name + ">", "i")
-    );
-    if (value && value[2]) {
-      return value[2];
-    } else {
-      return null;
-    }
-  },
-
-  fileExists: function (path) {
-    try {
-      return fs.statSync(path).isFile();
-    } catch (e) {
-      return false;
-    }
-  },
-
-  directoryExists: function (path) {
-    try {
-      return fs.statSync(path).isDirectory();
-    } catch (e) {
-      return false;
-    }
-  },
-};
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/src/android/CordovaHMSGMSCheckPlugin.java b/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/src/android/CordovaHMSGMSCheckPlugin.java
deleted file mode 100644
index 86307e6b..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/src/android/CordovaHMSGMSCheckPlugin.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.huawei.cordovahmsgmscheckplugin;
-
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-
-import com.huawei.hms.api.HuaweiApiAvailability;
-// import com.google.android.gms.common.GoogleApiAvailability;
- 
-import org.apache.cordova.CordovaInterface;
-import org.apache.cordova.CordovaInterfaceImpl;
-import org.apache.cordova.CordovaPlugin;
-import org.apache.cordova.CallbackContext;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * This class echoes a string called from JavaScript.
- */
-public class CordovaHMSGMSCheckPlugin extends CordovaPlugin {
-
-    private static final String TAG = CordovaHMSGMSCheckPlugin.class.getSimpleName();
-    private CallbackContext mCallbackContext;
-
-    @Override
-    public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
-        switch (action) {
-            case "isHmsAvailable":
-                mCallbackContext = callbackContext;
-                cordova.getThreadPool().execute(this::isHmsAvailable);
-                return true;
-            case "isGmsAvailable":
-                // mCallbackContext = callbackContext;
-                // cordova.getThreadPool().execute(this::isGmsAvailable);
-                return false;
-        }
-        return false;
-    }
-
-    private void isHmsAvailable() {
-        boolean isAvailable = false;
-        Context context = cordova.getContext();
-        if (null != cordova.getContext()) {
-            int result = HuaweiApiAvailability.getInstance().isHuaweiMobileServicesAvailable(context);
-            isAvailable = (com.huawei.hms.api.ConnectionResult.SUCCESS == result);
-        }
-        Log.i("Cordova", "isHmsAvailable: " + isAvailable);
-        String msg = "false";
-        if(isAvailable){
-            msg = "true";
-        }
-        outputCallbackContext(0, msg);
-    }
-
-    // private void isGmsAvailable() {
-    //     boolean isAvailable = false;
-    //     Context context = cordova.getContext();
-    //     if (null != context) {
-    //         int result = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context);
-    //         isAvailable = (com.google.android.gms.common.ConnectionResult.SUCCESS == result);
-    //     }
-    //     Log.i("Cordova",  "isGmsAvailable: " + isAvailable);
-    //     String msg = "false";
-    //     if(isAvailable){
-    //         msg = "true";
-    //     }
-    //     outputCallbackContext(0, msg);
-    // }
-
-    /**
-     * @param type 0-success,1-error
-     * @param msg message
-     */
-    private void outputCallbackContext(int type, String msg) {
-        if (mCallbackContext != null) {
-            switch (type) {
-                case 0:
-                    mCallbackContext.success(msg);
-                    break;
-                case 1:
-                    mCallbackContext.error(msg);
-                    break;
-            }
-        }
-    }
-}
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/src/android/build.gradle b/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/src/android/build.gradle
deleted file mode 100644
index 30dda1bf..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSGMSCheckPlugin/src/android/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    repositories {
-        google()
-        jcenter()
-        // huawei maven
-        maven { url 'http://developer.huawei.com/repo/' }
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
-        // classpath 'com.huawei.agconnect:agcp:1.2.0.300'
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-        // huawei maven
-        maven { url 'http://developer.huawei.com/repo/' }
-    }
-}
-
-cdvPluginPostBuildExtras.add({
-    apply plugin: 'com.huawei.agconnect'
-})
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/package.json b/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/package.json
deleted file mode 100644
index 8b3323cf..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "com.huawei.cordovahmslocationplugin",
-  "version": "1.0.0",
-  "description": "Location Service",
-  "cordova": {
-    "id": "com.huawei.cordovahmslocationplugin",
-    "platforms": [
-      "android"
-    ]
-  },
-  "keywords": [
-    "ecosystem:cordova",
-    "cordova-android"
-  ],
-  "author": "",
-  "license": "ISC"
-}
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/plugin.xml b/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/plugin.xml
deleted file mode 100644
index 126ffbc8..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<plugin xmlns:android="http://schemas.android.com/apk/res/android" id="com.huawei.cordovahmslocationplugin"
-    version="1.0.0"
-    xmlns="http://apache.org/cordova/ns/plugins/1.0">
-    <name>CordovaHMSLocationPlugin</name>
-    <js-module name="CordovaHMSLocationPlugin" src="www/CordovaHMSLocationPlugin.js">
-        <clobbers target="cordova.plugins.CordovaHMSLocationPlugin" />
-    </js-module>
-    <platform name="android">
-        <!-- hook for add maven repositories and agc plugin-->
-        <hook src="scripts/android/after_plugin_install.js" type="after_plugin_install" />
-        <hook src="scripts/android/before_plugin_uninstall.js" type="before_plugin_uninstall" />
-
-        <framework custom="true" src="src/android/build.gradle" type="gradleReference" />
-        <!-- Location Kit dependency-->
-        <framework src="com.huawei.hms:location:4.0.0.300" />
-        <config-file parent="/*" target="res/xml/config.xml">
-            <feature name="CordovaHMSLocationPlugin">
-                <param name="android-package"
-                    value="com.huawei.cordovahmslocationplugin.CordovaHMSLocationPlugin" />
-            </feature>
-        </config-file>
-        <config-file parent="/*" target="AndroidManifest.xml"></config-file>
-        <source-file src="src/android/CordovaHMSLocationPlugin.java"
-            target-dir="src/com/huawei/cordovahmslocationplugin" />
-    </platform>
-    <!-- Script help to copy agconnect-services.json to right places-->
-    <hook src="scripts/after_prepare.js" type="after_prepare" />
-</plugin>
\ No newline at end of file
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/scripts/after_prepare.js b/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/scripts/after_prepare.js
deleted file mode 100644
index adc5a480..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/scripts/after_prepare.js
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-/**
- * This hook makes sure projects using [cordova-plugin-firebase](https://github.com/arnesson/cordova-plugin-firebase)
- * will build properly and have the required key files copied to the proper destinations when the app is build on Ionic Cloud using the package command.
- * Credits: https://github.com/arnesson.
- */
-var fs = require('fs');
-var path = require('path');
-var utilities = require("./lib/utilities");
-
-var config = fs.readFileSync('config.xml').toString();
-var name = utilities.getValue(config, 'name');
-
-var ANDROID_DIR = 'platforms/android';
-
-var PLATFORM = {
-  ANDROID: {
-    dest: [
-      ANDROID_DIR + '/app/agconnect-services.json'
-    ],
-    src: [
-      'agconnect-services.json'
-    ],
-  }
-};
-
-module.exports = function (context) {
-  //get platform from the context supplied by cordova
-  var platforms = context.opts.platforms;
-  // Copy key files to their platform specific folders
-  if (platforms.indexOf('android') !== -1 && utilities.directoryExists(ANDROID_DIR)) {
-    console.log('Preparing HMS Location Kit on Android');
-    utilities.copyKey(PLATFORM.ANDROID);
-  }
-};
\ No newline at end of file
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/scripts/android/after_plugin_install.js b/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/scripts/android/after_plugin_install.js
deleted file mode 100644
index 09e73419..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/scripts/android/after_plugin_install.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var helper = require('./helper');
-
-module.exports = function(context) {
-
-    // Modify the Gradle build file to add a task that will upload the debug symbols
-    // at build time.
-    helper.restoreRootBuildGradle();
-    helper.modifyRootBuildGradle();
-};
\ No newline at end of file
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/scripts/android/before_plugin_uninstall.js b/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/scripts/android/before_plugin_uninstall.js
deleted file mode 100644
index 9c32e552..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/scripts/android/before_plugin_uninstall.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var helper = require('./helper');
-
-module.exports = function(context) {
-
-    // Remove the Gradle modifications that were added when the plugin was installed.
-    helper.restoreRootBuildGradle();
-};
\ No newline at end of file
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/scripts/android/helper.js b/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/scripts/android/helper.js
deleted file mode 100644
index da715c24..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/scripts/android/helper.js
+++ /dev/null
@@ -1,117 +0,0 @@
-var fs = require("fs");
-var path = require("path");
-
-function rootBuildGradleExists() {
-  var target = path.join("platforms", "android", "build.gradle");
-  return fs.existsSync(target);
-}
-
-/*
- * Helper function to read the build.gradle that sits at the root of the project
- */
-function readRootBuildGradle() {
-  var target = path.join("platforms", "android", "build.gradle");
-  return fs.readFileSync(target, "utf-8");
-}
-
-/*
- * Added a dependency on 'com.google.gms' based on the position of the know 'com.android.tools.build' dependency in the build.gradle
- */
-function addDependencies(buildGradle) {
-  // find the known line to match
-  var match = buildGradle.match(/^(\s*)classpath 'com.android.tools.build(.*)/m);
-  var whitespace = match[1];
-  
-  // modify the line to add the necessary dependencies
-  var agcDependency = whitespace + 'classpath \'com.huawei.agconnect:agcp:1.2.0.300\'' 
-
-  var modifiedLine = match[0] + '\n' + agcDependency;
-  
-  // modify the actual line
-  return buildGradle.replace(/^(\s*)classpath 'com.android.tools.build(.*)/m, modifiedLine);
-}
-
-/*
- * Add 'google()' and Crashlytics to the repository repo list
- */
-function addRepos(buildGradle) {
-  // find the known line to match
-  var match = buildGradle.match(/^(\s*)jcenter\(\)/m);
-  var whitespace = match[1];
-
-  // modify the line to add the necessary repo
-  var huaweiMavenRepo = whitespace + 'maven { url \'http://developer.huawei.com/repo/\' }'
-  var modifiedLine = match[0] + '\n' + huaweiMavenRepo;
-
-  // modify the actual line
-  buildGradle = buildGradle.replace(/^(\s*)jcenter\(\)/m, modifiedLine);
-
-  // update the all projects grouping
-  var allProjectsIndex = buildGradle.indexOf('allprojects');
-  if (allProjectsIndex > 0) {
-    // split the string on allprojects because jcenter is in both groups and we need to modify the 2nd instance
-    var firstHalfOfFile = buildGradle.substring(0, allProjectsIndex);
-    var secondHalfOfFile = buildGradle.substring(allProjectsIndex);
-
-    // Add google() to the allprojects section of the string
-    match = secondHalfOfFile.match(/^(\s*)jcenter\(\)/m);
-    var huaweiMavenRepo = whitespace + 'maven { url \'http://developer.huawei.com/repo/\' }'
-    modifiedLine = match[0] + '\n' + huaweiMavenRepo;
-    // modify the part of the string that is after 'allprojects'
-    secondHalfOfFile = secondHalfOfFile.replace(/^(\s*)jcenter\(\)/m, modifiedLine);
-
-    // recombine the modified line
-    buildGradle = firstHalfOfFile + secondHalfOfFile;
-  } else {
-    // this should not happen, but if it does, we should try to add the dependency to the buildscript
-    match = buildGradle.match(/^(\s*)jcenter\(\)/m);
-    var huaweiMavenRepo = whitespace + 'maven { url \'http://developer.huawei.com/repo/\' }'
-    modifiedLine = match[0] + '\n' + huaweiMavenRepo;
-    // modify the part of the string that is after 'allprojects'
-    buildGradle = buildGradle.replace(/^(\s*)jcenter\(\)/m, modifiedLine);
-  }
-
-  return buildGradle;
-}
-
-/*
- * Helper function to write to the build.gradle that sits at the root of the project
- */
-function writeRootBuildGradle(contents) {
-  var target = path.join("platforms", "android", "build.gradle");
-  fs.writeFileSync(target, contents);
-}
-
-module.exports = {
-
-  modifyRootBuildGradle: function() {
-    // be defensive and don't crash if the file doesn't exist
-    if (!rootBuildGradleExists) {
-      return;
-    }
-
-    var buildGradle = readRootBuildGradle();
-
-    // Add Google Play Services Dependency
-    buildGradle = addDependencies(buildGradle);
-  
-    // Add Google's Maven Repo
-    buildGradle = addRepos(buildGradle);
-
-    writeRootBuildGradle(buildGradle);
-  },
-
-  restoreRootBuildGradle: function() {
-    // be defensive and don't crash if the file doesn't exist
-    if (!rootBuildGradleExists) {
-      return;
-    }
-
-    var buildGradle = readRootBuildGradle();
-
-    // remove any lines we added
-    buildGradle = buildGradle.replace(/(?:^|\r?\n)(.*)com.huawei.cordovahmspushplugin*?(?=$|\r?\n)/g, '');
-  
-    writeRootBuildGradle(buildGradle);
-  }
-};
\ No newline at end of file
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/scripts/lib/utilities.js b/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/scripts/lib/utilities.js
deleted file mode 100644
index 015f6831..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/scripts/lib/utilities.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Utilities and shared functionality for the build hooks.
- */
-var fs = require('fs');
-var path = require("path");
-
-fs.ensureDirSync = function (dir) {
-  if (!fs.existsSync(dir)) {
-    dir.split(path.sep).reduce(function (currentPath, folder) {
-      currentPath += folder + path.sep;
-      if (!fs.existsSync(currentPath)) {
-        fs.mkdirSync(currentPath);
-      }
-      return currentPath;
-    }, '');
-  }
-};
-
-module.exports = {
-  /**
-     * Used to get the name of the application as defined in the config.xml.
-     *
-     * @param {object} context - The Cordova context.
-     * @returns {string} The value of the name element in config.xml.
-     */
-  getAppName: function (context) {
-    var ConfigParser = context.requireCordovaModule("cordova-lib").configparser;
-    var config = new ConfigParser("config.xml");
-    return config.name();
-  },
-
-  /**
-     * The ID of the plugin; this should match the ID in plugin.xml.
-     */
-  getPluginId: function () {
-    return "com.huawei.cordovahmspushplugin";
-  },
-
-  copyKey: function (platform) {
-    for (var i = 0; i < platform.src.length; i++) {
-      var file = platform.src[i];
-      if (this.fileExists(file)) {
-        try {
-          var contents = fs.readFileSync(file).toString();
-
-          try {
-            platform.dest.forEach(function (destinationPath) {
-              var folder = destinationPath.substring(0, destinationPath.lastIndexOf('/'));
-              fs.ensureDirSync(folder);
-              fs.writeFileSync(destinationPath, contents);
-            });
-          } catch (e) {
-            // skip
-          }
-        } catch (err) {
-          console.log(err);
-        }
-
-        break;
-      }
-    }
-  },
-
-  getValue: function (config, name) {
-    var value = config.match(new RegExp('<' + name + '(.*?)>(.*?)</' + name + '>', 'i'));
-    if (value && value[2]) {
-      return value[2]
-    } else {
-      return null
-    }
-  },
-
-  fileExists: function (path) {
-    try {
-      return fs.statSync(path).isFile();
-    } catch (e) {
-      return false;
-    }
-  },
-
-  directoryExists: function (path) {
-    try {
-      return fs.statSync(path).isDirectory();
-    } catch (e) {
-      return false;
-    }
-  }
-};
\ No newline at end of file
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/src/android/CordovaHMSLocationPlugin.java b/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/src/android/CordovaHMSLocationPlugin.java
deleted file mode 100644
index 4b094ad5..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/src/android/CordovaHMSLocationPlugin.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package com.huawei.cordovahmslocationplugin;
-
-import android.Manifest;
-import android.content.IntentSender;
-import android.location.Location;
-import android.os.Build;
-import android.os.Looper;
-import android.util.Log;
-
-import com.huawei.hms.common.ApiException;
-import com.huawei.hms.common.ResolvableApiException;
-import com.huawei.hms.location.FusedLocationProviderClient;
-import com.huawei.hms.location.LocationCallback;
-import com.huawei.hms.location.LocationRequest;
-import com.huawei.hms.location.LocationResult;
-import com.huawei.hms.location.LocationServices;
-import com.huawei.hms.location.LocationSettingsRequest;
-import com.huawei.hms.location.LocationSettingsStatusCodes;
-import com.huawei.hms.location.SettingsClient;
-
-import org.apache.cordova.CallbackContext;
-import org.apache.cordova.CordovaPlugin;
-import org.apache.cordova.PluginResult;
-import org.json.JSONArray;
-import org.json.JSONException;
-
-/**
- *
- */
- // https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-References-V1/data-types-0000001056511617-V1#section2512153819346
-public class CordovaHMSLocationPlugin extends CordovaPlugin {
-
-    private static final String TAG = CordovaHMSLocationPlugin.class.getSimpleName();
-
-    private FusedLocationProviderClient fusedLocationProviderClient;
-    private LocationRequest mLocationRequest;
-    private LocationCallback mLocationCallback;
-    private CallbackContext mCallbackContext;
-
-    @Override
-    public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
-        requestPermission();
-        if (fusedLocationProviderClient == null) {
-            fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(cordova.getContext());
-        }
-        switch (action) {
-            case "requestLocation":
-                this.setLocationRequest();
-                this.setLocationCallback();
-                this.checkLocationSetting(callbackContext);
-                return true;
-            case "removeLocation":
-                this.stopLocation();
-                return true;
-            case "getLastlocation":
-                this.getLastlocation(callbackContext);
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    private void returnLocation(Location location) {
-        if (mCallbackContext != null) {
-            Log.d(TAG, "returnLocation");
-            String message = location.getLatitude() + "," + location.getLongitude() + "," + location.isFromMockProvider();
-            PluginResult result = new PluginResult(PluginResult.Status.OK, message);
-            result.setKeepCallback(true);
-            mCallbackContext.sendPluginResult(result);
-        }
-    }
-
-    private void getLastlocation(CallbackContext callbackContext) {
-        fusedLocationProviderClient.getLastLocation().addOnSuccessListener(location -> {
-            Log.d(TAG, "getLastlocation success");
-            if (location == null) {
-                return;
-            }
-            // Location对象的处理逻辑
-            String message = location.getLatitude() + "," + location.getLongitude();
-            callbackContext.success(message);
-        }).addOnFailureListener(e -> {
-            // 异常处理逻辑
-            callbackContext.error("getLastlocation fail");
-        });
-    }
-
-    private void stopLocation() {
-        if (fusedLocationProviderClient == null) {
-            Log.d(TAG, "fusedLocationProviderClient is null");
-            return;
-        }
-        // 注意：停止位置更新时，mLocationCallback必须与requestLocationUpdates方法中的LocationCallback参数为同一对象。
-        fusedLocationProviderClient.removeLocationUpdates(mLocationCallback)
-            .addOnSuccessListener(aVoid -> {
-                // 停止位置更新成功
-                Log.d(TAG, "stop success");
-                mCallbackContext = null;
-            })
-            .addOnFailureListener(e -> {
-                // 停止位置更新失败
-                Log.d(TAG, "stop fail");
-            });
-    }
-
-    private void setLocationCallback() {
-        mLocationCallback = new LocationCallback() {
-            @Override
-            public void onLocationResult(LocationResult locationResult) {
-                if (locationResult != null) {
-                    //处理位置回调结果
-                    if (mLocationCallback != null) {
-                        Log.d(TAG, "onLocationResult");
-                        Location location = locationResult.getLocations().get(0);
-                        returnLocation(location);
-                    }
-                }
-            }
-        };
-    }
-
-    private void setLocationRequest() {
-        mLocationRequest = new LocationRequest();
-        // 设置位置更新的间隔(毫秒为单位)
-        mLocationRequest.setInterval(10000);
-//        mLocationRequest.setNumUpdates(1);
-        // 设置权重
-        mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
-    }
-
-    private void checkLocationSetting(CallbackContext callbackContext) {
-        SettingsClient settingsClient = LocationServices.getSettingsClient(cordova.getContext());
-        LocationSettingsRequest.Builder builder = new LocationSettingsRequest.Builder();
-        builder.addLocationRequest(mLocationRequest);
-        LocationSettingsRequest locationSettingsRequest = builder.build();
-        // 检查设备定位设置
-        settingsClient.checkLocationSettings(locationSettingsRequest)
-            .addOnSuccessListener(locationSettingsResponse -> {
-                
-                // 设置满足定位条件，再发起位置请求
-                fusedLocationProviderClient
-                    .requestLocationUpdates(mLocationRequest, mLocationCallback, Looper.getMainLooper())
-                    .addOnSuccessListener(aVoid -> {
-                        // 接口调用成功的处理
-                        Log.d(TAG, "request success");
-                        mCallbackContext = callbackContext;
-                    });
-            })
-            .addOnFailureListener(e -> {
-                // 设置不满足定位条件
-                int statusCode = ((ApiException) e).getStatusCode();
-                switch (statusCode) {
-                    case LocationSettingsStatusCodes.RESOLUTION_REQUIRED:
-                        try {
-                            ResolvableApiException rae = (ResolvableApiException) e;
-                            // 调用startResolutionForResult可以弹窗提示用户打开相应权限
-                            rae.startResolutionForResult(cordova.getActivity(), 0);
-                        } catch (IntentSender.SendIntentException sie) {
-                            Log.d(TAG, sie.getMessage());
-                        }
-                        break;
-                }
-            });
-    }
-
-    private void requestPermission() {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
-            Log.i(TAG, "sdk < 29 Q");
-            if (!cordova.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)
-                || !cordova.hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION)) {
-                String[] strings =
-                    {Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION};
-                cordova.requestPermissions(this, 1, strings);
-            }
-        } else {
-            if (!cordova.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)
-                || !cordova.hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
-                || !cordova.hasPermission("android.permission.ACCESS_BACKGROUND_LOCATION")) {
-                String[] strings = {android.Manifest.permission.ACCESS_FINE_LOCATION,
-                    android.Manifest.permission.ACCESS_COARSE_LOCATION,
-                    "android.permission.ACCESS_BACKGROUND_LOCATION"};
-                cordova.requestPermissions(this, 2, strings);
-            }
-        }
-    }
-}
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/src/android/build.gradle b/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/src/android/build.gradle
deleted file mode 100644
index 23296fb7..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSLocationPlugin/src/android/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    repositories {
-        google()
-        jcenter()
-        // huawei maven
-        maven { url 'http://developer.huawei.com/repo/' }
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
-        classpath 'com.huawei.agconnect:agcp:1.2.0.300'
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-        // huawei maven
-        maven { url 'http://developer.huawei.com/repo/' }
-    }
-}
-
-cdvPluginPostBuildExtras.add({
-    apply plugin: 'com.huawei.agconnect'
-})
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/package.json b/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/package.json
deleted file mode 100644
index 9be71e48..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "cordovahmspushplugin",
-  "version": "1.0.0",
-  "description": "For Hms Push",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "test",
-  "license": "ISC",
-  "cordova": {
-    "id": "com.huawei.cordovahmspushplugin",
-    "platforms": [
-      "android"
-    ]
-  },
-  "keywords": [
-    "ecosystem:cordova",
-    "cordova-android"
-  ]
-}
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/plugin.xml b/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/plugin.xml
deleted file mode 100644
index d7ccbfa7..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/plugin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Plugin Id and Version-->
-<plugin xmlns:android="http://schemas.android.com/apk/res/android"
-    id="com.huawei.cordovahmspushplugin" version="1.0.0"
-    xmlns="http://apache.org/cordova/ns/plugins/1.0">
-    <js-module name="CordovaHMSPushPlugin" src="www/CordovaHMSPushPlugin.js">
-        <clobbers target="cordova.plugins.CordovaHMSPushPlugin" />
-    </js-module>
-    <!-- Plugin Name -->
-    <name>CordovaHMSPushPlugin</name>
-    <platform name="android">
-        <!-- hook for add maven repositories and agc plugin-->
-        <hook src="scripts/android/after_plugin_install.js" type="after_plugin_install" />
-        <hook src="scripts/android/before_plugin_uninstall.js" type="before_plugin_uninstall" />
-
-        <framework custom="true" src="src/android/build.gradle" type="gradleReference" />
-        <!-- Push Kit dependency-->
-        <framework src="com.huawei.hms:push:4.0.0.300" />
-        <config-file parent="/*" target="res/xml/config.xml">
-            <feature name="CordovaHMSPushPlugin">
-                <param name="android-package"
-                    value="com.huawei.cordovahmspushplugin.CordovaHMSPushPlugin" />
-            </feature>
-        </config-file>
-        <config-file parent="/manifest/application" target="AndroidManifest.xml">
-			<service android:exported="false" android:name="com.huawei.cordovahmspushplugin.MessageService">
-				<intent-filter>
-					<action android:name="com.huawei.push.action.MESSAGING_EVENT" />
-				</intent-filter>
-			</service>
-		</config-file>
-        <source-file src="src/android/CordovaHMSPushPlugin.java"
-            target-dir="src/com/huawei/cordovahmspushplugin" />
-		<source-file src="src/android/MessageService.java"
-			target-dir="src/com/huawei/cordovahmspushplugin" />
-    </platform>
-    <!-- Script help to copy agconnect-services.json to right places-->
-    <hook src="scripts/after_prepare.js" type="after_prepare" />
-</plugin>
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/scripts/after_prepare.js b/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/scripts/after_prepare.js
deleted file mode 100644
index ab6c7b7e..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/scripts/after_prepare.js
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-/**
- * This hook makes sure projects using [cordova-plugin-firebase](https://github.com/arnesson/cordova-plugin-firebase)
- * will build properly and have the required key files copied to the proper destinations when the app is build on Ionic Cloud using the package command.
- * Credits: https://github.com/arnesson.
- */
-var fs = require('fs');
-var path = require('path');
-var utilities = require("./lib/utilities");
-
-var config = fs.readFileSync('config.xml').toString();
-var name = utilities.getValue(config, 'name');
-
-var ANDROID_DIR = 'platforms/android';
-
-var PLATFORM = {
-  ANDROID: {
-    dest: [
-      ANDROID_DIR + '/app/agconnect-services.json'
-    ],
-    src: [
-      'agconnect-services.json'
-    ],
-  }
-};
-
-module.exports = function (context) {
-  //get platform from the context supplied by cordova
-  var platforms = context.opts.platforms;
-  // Copy key files to their platform specific folders
-  if (platforms.indexOf('android') !== -1 && utilities.directoryExists(ANDROID_DIR)) {
-    console.log('Preparing HMS Push Kit on Android');
-    utilities.copyKey(PLATFORM.ANDROID);
-  }
-};
\ No newline at end of file
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/scripts/android/after_plugin_install.js b/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/scripts/android/after_plugin_install.js
deleted file mode 100644
index 09e73419..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/scripts/android/after_plugin_install.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var helper = require('./helper');
-
-module.exports = function(context) {
-
-    // Modify the Gradle build file to add a task that will upload the debug symbols
-    // at build time.
-    helper.restoreRootBuildGradle();
-    helper.modifyRootBuildGradle();
-};
\ No newline at end of file
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/scripts/android/before_plugin_uninstall.js b/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/scripts/android/before_plugin_uninstall.js
deleted file mode 100644
index 9c32e552..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/scripts/android/before_plugin_uninstall.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var helper = require('./helper');
-
-module.exports = function(context) {
-
-    // Remove the Gradle modifications that were added when the plugin was installed.
-    helper.restoreRootBuildGradle();
-};
\ No newline at end of file
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/scripts/android/helper.js b/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/scripts/android/helper.js
deleted file mode 100644
index da715c24..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/scripts/android/helper.js
+++ /dev/null
@@ -1,117 +0,0 @@
-var fs = require("fs");
-var path = require("path");
-
-function rootBuildGradleExists() {
-  var target = path.join("platforms", "android", "build.gradle");
-  return fs.existsSync(target);
-}
-
-/*
- * Helper function to read the build.gradle that sits at the root of the project
- */
-function readRootBuildGradle() {
-  var target = path.join("platforms", "android", "build.gradle");
-  return fs.readFileSync(target, "utf-8");
-}
-
-/*
- * Added a dependency on 'com.google.gms' based on the position of the know 'com.android.tools.build' dependency in the build.gradle
- */
-function addDependencies(buildGradle) {
-  // find the known line to match
-  var match = buildGradle.match(/^(\s*)classpath 'com.android.tools.build(.*)/m);
-  var whitespace = match[1];
-  
-  // modify the line to add the necessary dependencies
-  var agcDependency = whitespace + 'classpath \'com.huawei.agconnect:agcp:1.2.0.300\'' 
-
-  var modifiedLine = match[0] + '\n' + agcDependency;
-  
-  // modify the actual line
-  return buildGradle.replace(/^(\s*)classpath 'com.android.tools.build(.*)/m, modifiedLine);
-}
-
-/*
- * Add 'google()' and Crashlytics to the repository repo list
- */
-function addRepos(buildGradle) {
-  // find the known line to match
-  var match = buildGradle.match(/^(\s*)jcenter\(\)/m);
-  var whitespace = match[1];
-
-  // modify the line to add the necessary repo
-  var huaweiMavenRepo = whitespace + 'maven { url \'http://developer.huawei.com/repo/\' }'
-  var modifiedLine = match[0] + '\n' + huaweiMavenRepo;
-
-  // modify the actual line
-  buildGradle = buildGradle.replace(/^(\s*)jcenter\(\)/m, modifiedLine);
-
-  // update the all projects grouping
-  var allProjectsIndex = buildGradle.indexOf('allprojects');
-  if (allProjectsIndex > 0) {
-    // split the string on allprojects because jcenter is in both groups and we need to modify the 2nd instance
-    var firstHalfOfFile = buildGradle.substring(0, allProjectsIndex);
-    var secondHalfOfFile = buildGradle.substring(allProjectsIndex);
-
-    // Add google() to the allprojects section of the string
-    match = secondHalfOfFile.match(/^(\s*)jcenter\(\)/m);
-    var huaweiMavenRepo = whitespace + 'maven { url \'http://developer.huawei.com/repo/\' }'
-    modifiedLine = match[0] + '\n' + huaweiMavenRepo;
-    // modify the part of the string that is after 'allprojects'
-    secondHalfOfFile = secondHalfOfFile.replace(/^(\s*)jcenter\(\)/m, modifiedLine);
-
-    // recombine the modified line
-    buildGradle = firstHalfOfFile + secondHalfOfFile;
-  } else {
-    // this should not happen, but if it does, we should try to add the dependency to the buildscript
-    match = buildGradle.match(/^(\s*)jcenter\(\)/m);
-    var huaweiMavenRepo = whitespace + 'maven { url \'http://developer.huawei.com/repo/\' }'
-    modifiedLine = match[0] + '\n' + huaweiMavenRepo;
-    // modify the part of the string that is after 'allprojects'
-    buildGradle = buildGradle.replace(/^(\s*)jcenter\(\)/m, modifiedLine);
-  }
-
-  return buildGradle;
-}
-
-/*
- * Helper function to write to the build.gradle that sits at the root of the project
- */
-function writeRootBuildGradle(contents) {
-  var target = path.join("platforms", "android", "build.gradle");
-  fs.writeFileSync(target, contents);
-}
-
-module.exports = {
-
-  modifyRootBuildGradle: function() {
-    // be defensive and don't crash if the file doesn't exist
-    if (!rootBuildGradleExists) {
-      return;
-    }
-
-    var buildGradle = readRootBuildGradle();
-
-    // Add Google Play Services Dependency
-    buildGradle = addDependencies(buildGradle);
-  
-    // Add Google's Maven Repo
-    buildGradle = addRepos(buildGradle);
-
-    writeRootBuildGradle(buildGradle);
-  },
-
-  restoreRootBuildGradle: function() {
-    // be defensive and don't crash if the file doesn't exist
-    if (!rootBuildGradleExists) {
-      return;
-    }
-
-    var buildGradle = readRootBuildGradle();
-
-    // remove any lines we added
-    buildGradle = buildGradle.replace(/(?:^|\r?\n)(.*)com.huawei.cordovahmspushplugin*?(?=$|\r?\n)/g, '');
-  
-    writeRootBuildGradle(buildGradle);
-  }
-};
\ No newline at end of file
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/scripts/lib/utilities.js b/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/scripts/lib/utilities.js
deleted file mode 100644
index 015f6831..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/scripts/lib/utilities.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Utilities and shared functionality for the build hooks.
- */
-var fs = require('fs');
-var path = require("path");
-
-fs.ensureDirSync = function (dir) {
-  if (!fs.existsSync(dir)) {
-    dir.split(path.sep).reduce(function (currentPath, folder) {
-      currentPath += folder + path.sep;
-      if (!fs.existsSync(currentPath)) {
-        fs.mkdirSync(currentPath);
-      }
-      return currentPath;
-    }, '');
-  }
-};
-
-module.exports = {
-  /**
-     * Used to get the name of the application as defined in the config.xml.
-     *
-     * @param {object} context - The Cordova context.
-     * @returns {string} The value of the name element in config.xml.
-     */
-  getAppName: function (context) {
-    var ConfigParser = context.requireCordovaModule("cordova-lib").configparser;
-    var config = new ConfigParser("config.xml");
-    return config.name();
-  },
-
-  /**
-     * The ID of the plugin; this should match the ID in plugin.xml.
-     */
-  getPluginId: function () {
-    return "com.huawei.cordovahmspushplugin";
-  },
-
-  copyKey: function (platform) {
-    for (var i = 0; i < platform.src.length; i++) {
-      var file = platform.src[i];
-      if (this.fileExists(file)) {
-        try {
-          var contents = fs.readFileSync(file).toString();
-
-          try {
-            platform.dest.forEach(function (destinationPath) {
-              var folder = destinationPath.substring(0, destinationPath.lastIndexOf('/'));
-              fs.ensureDirSync(folder);
-              fs.writeFileSync(destinationPath, contents);
-            });
-          } catch (e) {
-            // skip
-          }
-        } catch (err) {
-          console.log(err);
-        }
-
-        break;
-      }
-    }
-  },
-
-  getValue: function (config, name) {
-    var value = config.match(new RegExp('<' + name + '(.*?)>(.*?)</' + name + '>', 'i'));
-    if (value && value[2]) {
-      return value[2]
-    } else {
-      return null
-    }
-  },
-
-  fileExists: function (path) {
-    try {
-      return fs.statSync(path).isFile();
-    } catch (e) {
-      return false;
-    }
-  },
-
-  directoryExists: function (path) {
-    try {
-      return fs.statSync(path).isDirectory();
-    } catch (e) {
-      return false;
-    }
-  }
-};
\ No newline at end of file
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/src/android/CordovaHMSPushPlugin.java b/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/src/android/CordovaHMSPushPlugin.java
deleted file mode 100644
index d2ef10b4..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/src/android/CordovaHMSPushPlugin.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.huawei.cordovahmspushplugin;
-
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.huawei.agconnect.config.AGConnectServicesConfig;
-import com.huawei.hms.aaid.HmsInstanceId;
-import com.huawei.hms.push.HmsMessaging;
-import com.huawei.hmf.tasks.OnCompleteListener;
-import com.huawei.hmf.tasks.Task;
-
-import org.apache.cordova.CallbackContext;
-import org.apache.cordova.CordovaPlugin;
-import org.apache.cordova.PluginResult;
-import org.json.JSONArray;
-import org.json.JSONException;
-
-/**
- * This class echoes a string called from JavaScript.
- */
-public class CordovaHMSPushPlugin extends CordovaPlugin {
-
-	private static final String TAG = CordovaHMSPushPlugin.class.getSimpleName();
-
-	private static CallbackContext mCallbackContext;
-    private static CallbackContext mTokenCallback;
-
-    @Override
-    public boolean execute(String action, JSONArray args, CallbackContext callbackContext) {
-        switch (action) {
-            case "getToken":
-                this.getToken(callbackContext);
-                return true;
-            case "getMessageCallback":
-                Log.d(TAG, "getMessageCallback");
-                mCallbackContext = callbackContext;
-                return true;
-            case "subscribeTopic":
-				Log.d(TAG, "subscribeTopic");
-                try {
-                    String topic = args.getString(0); 
-                    this.subscribeTopic(topic, callbackContext);
-                } catch (JSONException e) {
-                    return true;
-                }
-				return true;
-            default:
-                return false;
-        }
-    }
-
-    public static void returnMessage(String message) {
-        if (mCallbackContext != null) {
-            Log.d(TAG, "returnMessage");
-            PluginResult result = new PluginResult(PluginResult.Status.OK, message);
-            result.setKeepCallback(true);
-            mCallbackContext.sendPluginResult(result);
-        }
-    }
-
-    public static void returnToken(String token) {
-        if (mTokenCallback != null) {
-            mTokenCallback.success(token);
-            mTokenCallback = null;
-        }
-    }
-
-    /**
-     * get push token
-     */
-    private void getToken(CallbackContext callbackContext) {
-        Log.i(TAG, "get token: begin");
-
-        try {
-            String appId = AGConnectServicesConfig.fromContext(cordova.getContext()).getString("client/app_id");
-            String pushToken = HmsInstanceId.getInstance(cordova.getContext()).getToken(appId, "HCM");
-            if (!TextUtils.isEmpty(pushToken)) {
-                Log.i(TAG, "get token:" + pushToken);
-                callbackContext.success(pushToken);
-            }else {
-                mTokenCallback = callbackContext;
-            }
-		} catch (Exception e) {
-			Log.e(TAG, "getToken Failed, " + e);
-			callbackContext.error("getToken Failed, error : " + e.getMessage());
-		}
-	}
-
-   public void subscribeTopic(String topic, final CallbackContext callBack) {
-		// callBack.success("user subscribe to topic named as: "+ topic);
-        if (topic == null || topic.toString().equals("")) {
-			callBack.error("topic is empty!");
-            return;
-        }
-        try {
-            HmsMessaging.getInstance(cordova.getContext()).subscribe(topic).
-                    addOnCompleteListener(new OnCompleteListener<Void>() {
-                        @Override
-                        public void onComplete(Task<Void> task) {
-                            if (task.isSuccessful()) {
-                                callBack.success("user subscribe to topic: "+ topic);
-                            } else {
-                                callBack.error("getToken Failed, error : " + task.getException().getMessage());
-                            }
-                        }
-                    });
-        } catch (Exception e) {
-            callBack.error("getToken Failed, error : " + e.getMessage());
-        }
-    }
-
-}
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/src/android/MessageService.java b/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/src/android/MessageService.java
deleted file mode 100644
index d32542ef..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/src/android/MessageService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.huawei.cordovahmspushplugin;
-
-import com.huawei.cordovahmspushplugin.CordovaHMSPushPlugin;
-import com.huawei.hms.push.HmsMessageService;
-import com.huawei.hms.push.RemoteMessage;
-
-import android.util.Log;
-
-public class MessageService extends HmsMessageService {
-
-    private static final String TAG = MessageService.class.getSimpleName();
-
-    @Override
-    public void onMessageReceived(RemoteMessage remoteMessage) {
-        super.onMessageReceived(remoteMessage);
-        Log.d(TAG, "onMessageReceived");
-        if (remoteMessage != null) {
-            String message = remoteMessage.getData();
-            Log.d(TAG, message);
-            CordovaHMSPushPlugin.returnMessage(message);
-        }
-    }
-
-    @Override
-    public void onNewToken(String s) {
-        super.onNewToken(s);
-        if (s != null) {
-            Log.d(TAG, "token:" + s);
-            CordovaHMSPushPlugin.returnToken(s);
-        }
-    }
-}
diff --git a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/src/android/build.gradle b/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/src/android/build.gradle
deleted file mode 100644
index 23296fb7..00000000
--- a/Mohem/CordovaHMSPlugin/CordovaHMSPushPlugin/src/android/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    repositories {
-        google()
-        jcenter()
-        // huawei maven
-        maven { url 'http://developer.huawei.com/repo/' }
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
-        classpath 'com.huawei.agconnect:agcp:1.2.0.300'
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-        // huawei maven
-        maven { url 'http://developer.huawei.com/repo/' }
-    }
-}
-
-cdvPluginPostBuildExtras.add({
-    apply plugin: 'com.huawei.agconnect'
-})
diff --git a/Mohem/config.xml b/Mohem/config.xml
index 726fa83c..7d297fd7 100644
--- a/Mohem/config.xml
+++ b/Mohem/config.xml
@@ -4,8 +4,6 @@
     <description>An app created by cloud Solutions</description>
     <author email="eservicescs@cloudsolution-sa.com" href="http://cloudsolution-sa.com">Cloud Solutions</author>
     <content src="index.html" />
-    <access origin="*" />
-    <allow-navigation href="*" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
     <allow-intent href="tel:*" />
@@ -50,9 +48,6 @@
         <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
         <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
         <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
-        <feature name="SocialSharing">
-            <param name="android-package" value="nl.xservices.plugins.SocialSharing" />
-        </feature>
     </platform>
     <platform name="ios">
         <allow-intent href="itms:*" />
@@ -112,29 +107,21 @@
     <plugin name="cordova-plugin-whitelist" spec="1.3.3" />
     <plugin name="cordova-plugin-statusbar" spec="2.4.2" />
     <plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
-    <plugin name="cordova-plugin-geolocation" spec="~4.0.1" />
     <plugin name="cordova-plugin-datepicker" spec="~0.9.3" />
     <plugin name="cordova-plugin-ionic-webview" spec="4.1.0">
         <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />
     </plugin>
     <plugin name="cordova-sqlite-storage" spec="^3.4.0" />
     <plugin name="cordova-plugin-nativestorage" spec="^2.3.2" />
-    <plugin name="cordova-plugin-ble-central" spec="^1.2.4" />
     <plugin name="uk.co.workingedge.phonegap.plugin.launchnavigator" spec="^3.2.2" />
-    <plugin name="cordova-plugin-themeablebrowser" spec="^0.2.18" />
-    <plugin name="cordova-plugin-inappbrowser" spec="^3.1.0" />
     <plugin name="cordova-plugin-globalization" spec="^1.11.0" />
     <plugin name="cordova-plugin-android-permissions" spec="^1.0.2" />
     <plugin name="cordova-plugin-device" spec="^2.0.3" />
     <plugin name="cordova-plugin-local-notification" spec="^0.9.0-beta.2" />
     <plugin name="cordova-plugin-badge" spec="^0.8.8" />
     <plugin name="cordova.plugins.diagnostic" spec="^5.0.1" />
-    <plugin name="phonegap-plugin-barcodescanner" spec="^8.1.0">
-        <variable name="ANDROID_SUPPORT_V4_VERSION" value="27.+" />
-    </plugin>
     <plugin name="cordova-plugin-camera" spec="^4.1.0" />
     <plugin name="cordova-plugin-ionic-keyboard" spec="^2.2.0" />
-    <plugin name="cordova-opentok-android-permissions" spec="^1.0.1" />
     <plugin name="cordova-plugin-appavailability" spec="^0.4.2" />
     <plugin name="cordova-plugin-apprate" spec="^1.4.0" />
     <plugin name="cordova-plugin-file" spec="^6.0.2" />
diff --git a/Mohem/key.jks b/Mohem/key.jks
index f63c61a7..3a972bae 100644
Binary files a/Mohem/key.jks and b/Mohem/key.jks differ
diff --git a/Mohem/package.json b/Mohem/package.json
index aab0bf8d..fca1c296 100644
--- a/Mohem/package.json
+++ b/Mohem/package.json
@@ -24,11 +24,8 @@
     "@ionic-native/android-permissions": "^5.18.0",
     "@ionic-native/app-availability": "^5.18.0",
     "@ionic-native/app-rate": "^5.18.0",
-    "@ionic-native/background-geolocation": "^5.30.0",
     "@ionic-native/badge": "^5.18.0",
-    "@ionic-native/barcode-scanner": "^5.18.0",
     "@ionic-native/base64": "^5.18.0",
-    "@ionic-native/ble": "^5.18.0",
     "@ionic-native/camera": "^5.18.0",
     "@ionic-native/core": "^5.8.0",
     "@ionic-native/date-picker": "^5.10.0",
@@ -41,24 +38,17 @@
     "@ionic-native/file-picker": "^5.36.0",
     "@ionic-native/fingerprint-aio": "^5.18.0",
     "@ionic-native/firebase-x": "^5.34.0",
-    "@ionic-native/geolocation": "^5.10.0",
     "@ionic-native/globalization": "^5.18.0",
     "@ionic-native/health": "^5.4.0",
-    "@ionic-native/in-app-browser": "^5.17.0",
     "@ionic-native/keyboard": "^5.17.0",
     "@ionic-native/launch-navigator": "^5.17.0",
     "@ionic-native/local-notifications": "^5.17.0",
     "@ionic-native/native-storage": "^5.17.0",
-    "@ionic-native/nfc": "^5.30.0",
     "@ionic-native/open-native-settings": "^5.14.0",
     "@ionic-native/sms-retriever": "^5.36.0",
-    "@ionic-native/social-sharing": "^5.34.0",
     "@ionic-native/splash-screen": "^5.0.0",
     "@ionic-native/sqlite": "^5.18.0",
     "@ionic-native/status-bar": "^5.0.0",
-    "@ionic-native/themeable-browser": "^5.18.0",
-    "@ionic-native/wifi-wizard-2": "^5.31.1",
-    "@ionic-native/zbar": "^5.10.0",
     "@ionic/angular": "^4.1.0",
     "@ng-bootstrap/ng-bootstrap": "^4.2.2",
     "@swimlane/ngx-charts": "^10.1.0",
@@ -69,7 +59,6 @@
     "cordova-android": "^8.1.0",
     "cordova-android-support-gradle-release": "^3.0.1",
     "cordova-open-native-settings": "^1.5.2",
-    "cordova-opentok-android-permissions": "^1.0.1",
     "cordova-plugin-actionsheet": "^2.3.3",
     "cordova-plugin-add-swift-support": "^2.0.2",
     "cordova-plugin-android-permissions": "^1.0.2",
@@ -78,7 +67,6 @@
     "cordova-plugin-appavailability": "^0.4.2",
     "cordova-plugin-apprate": "^1.4.0",
     "cordova-plugin-badge": "^0.8.8",
-    "cordova-plugin-ble-central": "^1.2.4",
     "cordova-plugin-camera": "^4.1.0",
     "cordova-plugin-datepicker": "^0.9.3",
     "cordova-plugin-device": "^2.0.3",
@@ -90,9 +78,7 @@
     "cordova-plugin-filepicker": "^1.1.6",
     "cordova-plugin-fingerprint-aio": "^3.0.0",
     "cordova-plugin-firebasex": "^13.0.0",
-    "cordova-plugin-geolocation": "^4.0.2",
     "cordova-plugin-globalization": "^1.11.0",
-    "cordova-plugin-inappbrowser": "^3.1.0",
     "cordova-plugin-ionic-keyboard": "^2.2.0",
     "cordova-plugin-ionic-webview": "^4.1.0",
     "cordova-plugin-local-notification": "^0.9.0-beta.2",
@@ -100,16 +86,12 @@
     "cordova-plugin-sms-retriever-manager": "^1.0.3",
     "cordova-plugin-splashscreen": "^5.0.3",
     "cordova-plugin-statusbar": "^2.4.3",
-    "cordova-plugin-themeablebrowser": "^0.2.18",
     "cordova-plugin-whitelist": "^1.3.4",
-    "cordova-plugin-wifiwizard2": "^3.1.1",
-    "cordova-plugin-x-socialsharing": "^6.0.3",
     "cordova-sqlite-storage": "^3.4.0",
     "cordova-support-google-services": "^1.3.2",
     "cordova.plugins.diagnostic": "^5.0.1",
     "core-js": "^2.5.4",
     "date-fns": "^1.30.1",
-    "es6-promise-plugin": "^4.1.0",
     "ionic2-calendar": "^0.5.8",
     "ionic4-rating": "^1.0.9",
     "ng-circle-progress": "^1.5.1",
@@ -117,8 +99,6 @@
     "ng2-pdf-viewer": "^5.3.2",
     "ngx-gauge": "^1.0.0-beta.10",
     "npm": "^6.14.11",
-    "phonegap-nfc": "^1.2.0",
-    "phonegap-plugin-barcodescanner": "^8.1.0",
     "phonegap-plugin-multidex": "^1.0.0",
     "primeicons": "^1.0.0",
     "primeng": "^7.1.3",
@@ -144,11 +124,7 @@
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~10.12.0",
     "codelyzer": "~4.5.0",
-    "com.huawei.cordovahmsgmscheckplugin": "file:CordovaHMSPlugin/CordovaHMSGMSCheckPlugin",
-    "com.huawei.cordovahmslocationplugin": "file:CordovaHMSPlugin/CordovaHMSLocationPlugin",
     "cordova-ios": "^6.2.0",
-    "cordova-plugin-wifiwizard2": "^3.1.1",
-    "es6-promise-plugin": "^4.1.0",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "^4.0.1",
@@ -175,10 +151,6 @@
       "cordova-plugin-badge": {},
       "cordova-plugin-ionic-keyboard": {},
       "cordova-plugin-datepicker": {},
-      "cordova-plugin-geolocation": {},
-      "phonegap-plugin-barcodescanner": {
-        "ANDROID_SUPPORT_V4_VERSION": "27.+"
-      },
       "cordova-plugin-ionic-webview": {
         "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
       },
@@ -193,12 +165,8 @@
       "cordova-plugin-filepath": {},
       "com-badrit-base64": {},
       "cordova-sqlite-storage": {},
-      "cordova-plugin-ble-central": {},
       "uk.co.workingedge.phonegap.plugin.launchnavigator": {},
-      "cordova-plugin-themeablebrowser": {},
-      "cordova-plugin-inappbrowser": {},
       "cordova-plugin-local-notification": {},
-      "cordova-opentok-android-permissions": {},
       "cordova-plugin-appavailability": {},
       "cordova-plugin-apprate": {},
       "cordova-plugin-fingerprint-aio": {
@@ -206,14 +174,6 @@
       },
       "cordova-plugin-androidx": {},
       "cordova-plugin-androidx-adapter": {},
-      "cordova-plugin-background-geolocation": {
-        "GOOGLE_PLAY_SERVICES_VERSION": "+"
-      },
-      "phonegap-nfc": {},
-      "wifiwizard2": {},
-      "com.huawei.cordovahmsgmscheckplugin": {},
-      "com.huawei.cordovahmslocationplugin": {},
-      "cordova-plugin-x-socialsharing": {},
       "cordova-plugin-firebasex": {
         "FIREBASE_ANALYTICS_COLLECTION_ENABLED": "true",
         "FIREBASE_PERFORMANCE_COLLECTION_ENABLED": "true",
@@ -250,8 +210,8 @@
       "cordova-plugin-filechooser": {}
     },
     "platforms": [
-      "android",
-      "ios"
+      "ios",
+      "android"
     ]
   }
 }
\ No newline at end of file
diff --git a/Mohem/resources/android/xml/network_security_config.xml b/Mohem/resources/android/xml/network_security_config.xml
index 14144c66..cb3e247f 100644
--- a/Mohem/resources/android/xml/network_security_config.xml
+++ b/Mohem/resources/android/xml/network_security_config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-<domain-config cleartextTrafficPermitted="true">
+<domain-config cleartextTrafficPermitted="false">
     <domain includeSubdomains="true">localhost</domain>
-      <domain includeSubdomains="true">hmg.com</domain>
+      <domain includeSubdomains="true">hrmsys.moenergy.gov.sa</domain>
 </domain-config>
 </network-security-config>
\ No newline at end of file
diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss
index 48249f3a..88d0367b 100644
--- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss
+++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss
@@ -139,8 +139,147 @@ ion-card-content.confirm-details {
       // }
 
     }
-
   }
+  
+  
+  
+  
+  
+  
+  .timeline {
+      position: relative;
+      margin: 15px 0 0 0;
+    //   border-bottom: solid 1px var(--cusgray);
+  }
+  
+  .timeline:before {
+   
+    content: '';
+    position: inherit !important;
+    top: 0;
+    bottom: 0;
+    width: 4px;
+    // background: #e4e4e4;
+    z-index: 1;
+    left: 35px;
+    /* margin-left: -10px; */
+    /* z-index: 1; */
+  }
+  
+  .timeline .timeline-thumb {
+   
+    border-radius: 500px;
+    width: 70px !important;
+    z-index: 2;
+    position: absolute;
+    left: 0px;
+    // :root[dir="ltr"]{
+    //    left: 37px;
+    // }
+    // :root[dir="rtl"]{
+    //     right: 37px;
+    // }
+    float: right;
+    top: 9px;
+  }
+  
+  .timeline .timeline-thumb.timeline-icon {
+      height: 70px;
+    //   text-align: center;
+    //   color: white;
+    //   border: 5px solid #CBD0D3;
+    //   transform: scale(0.2);
+  }
+  
+  
+  
+  .timeline .timeline-item {
+   // width: 40px;
+  
+  }
+  
+  .timeline .timeline-stats {
+      position: relative;
+      font-size: 12px;
+      color: var(--darkgray);
+    
+  }
+  
+  .empImge{
+    border-radius: 50%;
+    width:60px;
+    height: 60px;
+    border: #dedede solid 1px;
+  
+  }
+  .empImgeRep {
+    border-radius: 50% !important;
+    width: 80px;
+    height: 80px;
+    border: #dedede solid 1px;
+  }
+  
+  .line{
+    padding-bottom:87px;
+  }
+  
+  .attachLable{
+    position: absolute;
+      top: 0px;
+      z-index: 0;
+      background: #44A7A1;
+      color: #fff;
+      border-radius: 50%;
+      border: 0px;
+      width: 24px;
+      height: 24px;
+      text-align: center;
+      font-size: 5px;
+  }
+  
+  .removeLable{
+    top: 0px;
+    z-index: 0;
+    background: #d8252d;
+    color: #fff;
+    border-radius: 50%;
+    border: 0px;
+    width: 20px;
+    height: 20px;
+    text-align: center;
+    font-size: 5px;
+  }
+  
+  .note-modal {
+    // width: 90%;
+    // height: 50%;
+    // top: 20%;
+    // left: 5%;
+    // right: 5%;
+    // bottom: 5%;
+    background: rgba(0, 0, 0, 0.5) !important;
+    padding: 30% 10% !important;
+    --height: 12cm !important;
+    // --width: 80% !important;
+    --border-radius:20px;
+    
+  }
+  .header-toolbar-new{
+    --background: #024d71;
+  }
+  
+  .confirmEitOkButton{
+    white-space: normal !important;
+    text-transform: capitalize !important;
+    min-height: 45px !important;
+    min-width: 5px !important;
+    margin: 8px !important;
+    --background: #0ca2de;
+    width: 80% !important;
+    color: white!important;
+    border-radius: 16px !important;
+  }
+
 }
 
 
diff --git a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html
index d86a6c96..71480043 100644
--- a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html
+++ b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html
@@ -123,10 +123,10 @@
 
 <ion-footer>
   <div class="centerDiv">
-    <ion-button class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px;    --background: transparent; " ion-button (click)="submitAction()">
+    <ion-button class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px;    --background: transparent; --border-radius: 10px; " ion-button (click)="submitAction()">
       {{'general, submit' | translate}}</ion-button>
 
-      <ion-button class="footer-button" style="background: var(--darkblue)!important;border-radius: 10px;    --background: transparent; " ion-button (click)="closeModal()">
+      <ion-button class="footer-button" style="background: var(--darkblue)!important;border-radius: 10px;    --background: transparent; --border-radius: 10px; " ion-button (click)="closeModal()">
       {{'general, cancel' | translate}}</ion-button>
   </div>
 </ion-footer>
\ No newline at end of file
diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss
index 062f0f4d..411fade8 100644
--- a/Mohem/src/app/absence/home/home.component.scss
+++ b/Mohem/src/app/absence/home/home.component.scss
@@ -230,6 +230,7 @@
   position: absolute;
   content: "";
   // background: #BE332F;
+  // background: #024d71;
   height: 140px;
   width: 100%;
   left: 0;
@@ -275,6 +276,7 @@
 //   color: black;
 //   background-color: #CB3232;
 //   // background-color: #BE332F;
+//   // background-color: #024d71;
 //   width: 11%;
 //   height: 6px;
 //  }
diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss
index a17d5982..8bf666eb 100644
--- a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss
+++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss
@@ -4,23 +4,22 @@
   color: #7F8C8D;
 }
 
-.header-toolbar-new {
+.header-toolbar-new{
   --background: #BE332F;
-}
-
-.confirmEitOkButton {
-  white-space: normal !important;
-  text-transform: capitalize !important;
-  min-height: 45px !important;
-  min-width: 5px !important;
-  margin: 8px !important;
-  --background: #BE332F;
-  width: 80% !important;
-  color: white !important;
-  border-radius: 16px !important;
-  --border-radius: 16px !important;
-  --box-shadow: none;
-}
+  }
+  
+  .confirmEitOkButton{
+    white-space: normal !important;
+    text-transform: capitalize !important;
+    min-height: 45px !important;
+    min-width: 5px !important;
+    margin: 8px !important;
+    --background: #BE332F;
+    width: 80% !important;
+    color: white!important;
+    border-radius: 16px !important;
+    --border-radius: 16px !important;
+  }
 
 
 .label-Select {
diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts
index 159c4842..463eb444 100644
--- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts
+++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts
@@ -322,7 +322,8 @@ export class SubmitAbsenceComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else if (feildsList[i].FORMAT_TYPE == "N") {
             // number
@@ -333,7 +334,8 @@ export class SubmitAbsenceComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else if (feildsList[i].FORMAT_TYPE == "X") {
             // standard date
@@ -352,7 +354,8 @@ export class SubmitAbsenceComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.dateInput = new DateInput(
@@ -363,7 +366,8 @@ export class SubmitAbsenceComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
           } else if (feildsList[i].FORMAT_TYPE == "Y") {
@@ -382,7 +386,8 @@ export class SubmitAbsenceComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.datetimeInput = new DateTimeInput(
@@ -393,7 +398,8 @@ export class SubmitAbsenceComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
             const elem = document.getElementById(
@@ -423,7 +429,8 @@ export class SubmitAbsenceComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.timeInput = new TimeInput(
@@ -434,7 +441,8 @@ export class SubmitAbsenceComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
           }
@@ -448,7 +456,8 @@ export class SubmitAbsenceComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else {
             this.selectInput = new SelectInput(
@@ -458,7 +467,8 @@ export class SubmitAbsenceComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
 
             this.fillDropdownList(
diff --git a/Mohem/src/app/absence/view-attachments/view-attachments.component.scss b/Mohem/src/app/absence/view-attachments/view-attachments.component.scss
index 4560ae98..211351ee 100644
--- a/Mohem/src/app/absence/view-attachments/view-attachments.component.scss
+++ b/Mohem/src/app/absence/view-attachments/view-attachments.component.scss
@@ -1,3 +1,3 @@
 .header-toolbar-new {
   --background: #BE332F;
-}
\ No newline at end of file
+}
diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html
index ad790756..45f06cea 100644
--- a/Mohem/src/app/app.component.html
+++ b/Mohem/src/app/app.component.html
@@ -1,12 +1,12 @@
-<ion-app [dir]="direction">
+<ion-app [dir]="direction" id="lang">
   <ion-split-pane>
       <ion-menu [swipeGesture]="false" side='start' *ngIf="direction ==='ltr'">
         <ion-content class="sidebar-menu">
-          <div class="header-div">
-            <div>
+          <div class="header-div" style="visibility: hidden;">
+            <!-- <div>
             
                 <img class="closeIcon" (click)="closeMenu()"  style= "height: 18px !important;"  src="../assets/imgs/close_menu_icon.png ">
-            </div>
+            </div> -->
             <div > 
               <img class="mohemmLogo" src="../assets/imgs/menu_mohemm_logo.png" >
             </div>
@@ -21,15 +21,15 @@
             </div>
           </div>
   
-          <div   style="border-bottom: rgb(190, 187, 187) solid 1px;" >
+          <div class="border" >
             <button class="logout" ion-button  (click)="logout();" > {{ts.trPK('home','logout')}}</button>
           </div>
           <br> 
 
           <ion-list class="list-en" >
-            <ion-item (click)="profile()">
+            <ion-item (click)="profile()" lines="none">
               <ion-thumbnail slot="start" class="menu-thumb">
-                <img style= "height: 24px !important;"  src="../assets/imgs/profile_icon.png" item-left>
+                <img style= "height: 18px !important; width:16px"  src="../assets/imgs/profile_icon.png" item-left>
               </ion-thumbnail>
               <ion-label class="profile">
                 {{ts.trPK('userProfile','title')}}
@@ -43,7 +43,7 @@
                 {{ts.trPK('userProfile','performance-evaluation')}}
               </ion-label>
             </ion-item> -->
-            <ion-item [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
+            <ion-item lines="none" [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
               <ion-thumbnail slot="start" class="menu-thumb">
                 <img style= "height: 14px !important;"  src="../assets/imgs/my_team_icon.png" item-left>
               </ion-thumbnail>
@@ -113,22 +113,38 @@
   
           </ion-list>
 
-          <div class="" style="text-align:center">
-             <img src="{{companyUrl}}" class="CompanyImg logoImg">
-          </div>
+          <!-- <div class="" style="text-align:center">
+             <img src="../assets/icon/new-design/moe-logo.png" class="CompanyImg logoImg">
+
+          </div> -->
+
+        </ion-content>
+
+        <ion-footer  style="padding: 0px;">
+          <ion-row>
+            <div class="footer-container">
+              <ion-col class="colPad" size="9" style="visibility: hidden">
+                
+                <img class="logoFotor" src="../assets/imgs/menu_mohemm_logo.png" />
+              </ion-col>
+              <ion-col class="colPad" size="3">
+                
+                <img class="moe-logo" src="../assets/icon/moe-logo.png" />
+              </ion-col>
+            </div>
+          </ion-row>
           <div  class="menuFooter" >
-            <div> <img src="../assets/imgs/CSLogo.png"  class="CompanyImg"  ></div>
             <p class="companyTxt">{{companyDesc}}</p>
           </div>
-        </ion-content>
+        </ion-footer>
       </ion-menu>
 
       <ion-menu [swipeGesture]="false" side='end' *ngIf="direction ==='rtl'">
         <ion-content class="sidebar-menu">
-          <div class="header-div">
-            <div>
+          <div class="header-div" style="visibility: hidden;">
+            <!-- <div>
                 <img class="closeIcon" (click)="closeMenu()" style= "height: 18px !important;  margin-right: 15px;"  src="../assets/imgs/close_menu_icon.png ">
-            </div>
+            </div> -->
             <div> 
               <img class="mohemmLogo-ar" src="../assets/imgs/menu_mohemm_logo.png" >
             </div>
@@ -142,15 +158,15 @@
             </div>
           </div>
 
-          <div   style="border-bottom: rgb(190, 187, 187) solid 1px;" >
+          <div class="border" >
             <button class="logout-ar" ion-button  (click)="logout();" > {{ts.trPK('home','logout')}}</button>
           </div>
           <br>
 
           <ion-list class="list-ar" >
-            <ion-item (click)="profile()">
+            <ion-item (click)="profile()" lines="none">
               <ion-thumbnail slot="start" class="menu-thumb">
-                <img style= "height: 24px !important;"  src="../assets/imgs/profile_icon.png" item-left>
+                <img style= "height: 18px !important; width:16px"    src="../assets/imgs/profile_icon.png" item-left>
               </ion-thumbnail>
               <ion-label class="profile">
                 {{ts.trPK('userProfile','title')}}
@@ -164,7 +180,7 @@
                 {{ts.trPK('userProfile','performance-evaluation')}}
               </ion-label>
             </ion-item> -->
-            <ion-item [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
+            <ion-item lines="none" [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
               <ion-thumbnail slot="start" class="menu-thumb">
                 <img style= "height: 14px !important;"  src="../assets/imgs/my_team_icon.png" item-left>
               </ion-thumbnail>
@@ -256,14 +272,31 @@
           </ion-item> -->
         </ion-list>
 
-        <div class="" style="text-align:center">
-           <img src="{{companyUrl}}" class="CompanyImg" [ngClass]="TeamFlag!='true'? 'logoImg':'logoImgWithMyTeam'">
-        </div>
-        <div class="menuFooter">
-          <div> <img src="../assets/imgs/CSLogo.png" class="CompanyImg" ></div>
+        <!-- <div class="" style="text-align:center"> -->
+           <!-- <img src="{{companyUrl}}" class="CompanyImg" [ngClass]="TeamFlag!='true'? 'logoImg':'logoImgWithMyTeam'"> -->
+           <!-- <img src="../assets/icon/new-design/moe-logo.png" class="CompanyImg" [ngClass]="TeamFlag!='true'? 'logoImg':'logoImgWithMyTeam'"> -->
+          <!-- <p class="companyTxt">{{companyDesc}}</p> -->
+        <!-- </div> -->
+
+      </ion-content>
+
+      <ion-footer  style="padding: 0px;" dir="ltr">
+        <ion-row>
+          <div class="footer-container">
+            <ion-col class="colPad" size="9" style="visibility: hidden">
+              
+              <img class="logoFotor" src="../assets/imgs/menu_mohemm_logo.png" />
+            </ion-col>
+            <ion-col class="colPad" size="3">
+              
+              <img class="moe-logo" src="../assets/icon/moe-logo.png" />
+            </ion-col>
+          </div>
+        </ion-row>
+        <div  class="menuFooter" >
           <p class="companyTxt">{{companyDesc}}</p>
         </div>
-      </ion-content>
+      </ion-footer>
     </ion-menu>
     <ion-router-outlet main></ion-router-outlet>
   </ion-split-pane>
diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss
index 96588df1..5c58dad0 100644
--- a/Mohem/src/app/app.component.scss
+++ b/Mohem/src/app/app.component.scss
@@ -10,21 +10,21 @@ header
 }
 
 .mohemmLogo {
-
   max-width: 46% !important;
   border: 0 !important;
-  margin-left: 70px !important;
+  margin-right: 70px !important;
   margin-top: -24px !important;
-  margin-bottom: 11px;
+  margin-bottom: 5px;
+  margin: auto;
+  display: block;
 }
 
 .mohemmLogo-ar {
-
   max-width: 46% !important;
   border: 0 !important;
   margin-right: 70px !important;
   margin-top: -24px !important;
-  margin-bottom: 11px;
+  margin-bottom: 5px;
 }
 
 .closeIcon {
@@ -38,6 +38,10 @@ header
   top: 10px;
 }
 
+hr {
+  border-width: 1px;
+}
+
 
 .menubutton {
   white-space: normal;
@@ -79,26 +83,25 @@ header
 .logout {
   background-color: #c6903e;
   border: none;
-  color: white;
-  // padding: 20px;
+  color: #004D71;
   text-align: center;
   text-decoration: none;
   display: inline-block;
   font-size: 12px;
-  margin-left: 120px !important;
   margin-top: 15px !important;
   margin-bottom: 20px !important;
   border-radius: 30px;
-  //  width: 40px;
-  height: 26px;
-  padding: 6px 24px;
+  height: 35px;
+  margin: auto;
+  padding: 0px 24px;
+  display: block;
 
 }
 
 .logout-ar {
   background-color: #c6903e;
   border: none;
-  color: white;
+  color: #004D71;
   text-align: center;
   text-decoration: none;
   display: inline-block;
@@ -107,8 +110,8 @@ header
   margin-top: 15px !important;
   margin-bottom: 20px !important;
   border-radius: 30px;
-  height: 26px;
-  padding: 6px 24px;
+  height: 35px;
+  padding: 0px 24px;
 }
 
 .menuImg {
@@ -289,22 +292,27 @@ button.menu-item.item.item-block.item-ios {
 }
 
 .TxtPlace {
-  margin: 0;
-  padding: 0;
-  text-align: center;
-  font-weight: bolder;
-  color: black;
-  font-size: 16px;
+  font-size: 20px;
+  color: #004D71;
+  font-weight: bold;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  width: 90%;
+  margin: 10px auto auto auto;
 }
 
-.TxtPlaces {
 
-  margin: 0;
-  padding: 0;
-  text-align: center;
-  font-weight: bolder;
+.TxtPlaces {
   font-size: 14px;
-  color: darkgray;
+  color: #004D71;
+  font-weight: bold;
+  // font-family: 'Inter' !important;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  width: 90%;
+  margin: 5px auto;
 }
 
 .menuFooter {
@@ -314,6 +322,7 @@ button.menu-item.item.item-block.item-ios {
   margin: auto;
   width: 100%;
   position: absolute;
+  top: 40px
 }
 
 
@@ -323,41 +332,30 @@ button.menu-item.item.item-block.item-ios {
   margin: auto;
 }
 
-
-// .menuFooter .CompanyImg {
-//   width: 100%;
-//   height: 100%;
-// }
-
-
 .menuFooter .CompanyImg {
-  width: 80%;
-  height: 80%;
+  width: 65%;
+  height: 60%;
   margin-bottom: -21px;
 }
 
-//  .logoImg{
-//  width: 120px;
-// position: relative;
-// }
-
 .logoImgWithMyTeam {
-  width: 77px;
-  // position: relative;
-  margin-top: -1px;
-  margin-bottom: 70px;
+
+  width: 200px;
+  margin: 20px auto;
 }
 
 .logoImg {
   width: 250px;
   margin-top: 20px;
   margin-bottom: 180px;
+  width: 225px;
 }
 
 .companyTxt {
   font-size: 12px;
-  color: var(--customnavy);
+  color: #004D71;
   text-align: center;
+  font-family: 'Inter' !important;
 }
 
 ion-thumbnail.menu-thumb {
@@ -373,7 +371,7 @@ ion-thumbnail.menu-thumb {
 }
 
 .profile {
-  color: black !important;
+  color: #5C6F79 !important;
   font-weight: bolder !important;
 
 }
@@ -396,8 +394,8 @@ ion-thumbnail.menu-thumb {
 // }
 
 .profileImg {
-  width: 140px;
-  height: 140px;
+  width: 100px;
+  height: 100px;
   display: -webkit-inline-box;
   display: inline-flex;
   overflow: hidden;
@@ -405,4 +403,32 @@ ion-thumbnail.menu-thumb {
   border-radius: 70% !important;
   position: relative;
   top: 3px;
+}
+
+ion-item,
+.border {
+  border-bottom: #c7c7c7 solid 1px
+}
+
+
+.footer-container {
+  width: 100%;
+  display: -webkit-box;
+  display: flex;
+  -webkit-box-align: stretch;
+  align-items: stretch;
+}
+
+.footer-container .logoFotor {
+  margin: 20px;
+  float: left;
+  width: 100px !important;
+  height: 30px !important;
+}
+
+.footer-container .moe-logo {
+  width: 45px;
+  float: right;
+  margin-right: 16px;
+  margin-top: 15px;
 }
\ No newline at end of file
diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts
index 5dfb89d4..123d10ef 100644
--- a/Mohem/src/app/app.component.ts
+++ b/Mohem/src/app/app.component.ts
@@ -152,7 +152,6 @@ export class AppComponent implements OnInit {
         if (user) {
           console.log(user);
           this.userInfo = JSON.parse(localStorage.getItem('bussiness-card-info'));
-          console.log('ENAD TEST')
           console.log(this.userInfo)
           localStorage.setItem("digitalIDUser", JSON.stringify(user));
           this.digitalIDUser = user//JSON.stringify(user);
@@ -206,10 +205,10 @@ export class AppComponent implements OnInit {
             this.user_image = user.EMPLOYEE_IMAGE ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE : '../assets/imgs/profile.png';
           }
           // this.User_Job_name = user.JOB_NAME;
-          let jobTitle = user.POSITION_NAME.split('.');
-          if (jobTitle && jobTitle.length > 1) {
-            this.User_Job_name = jobTitle[0] + " " + jobTitle[1];
-          }
+          let jobTitle = user.POSITION_NAME;
+          // if (jobTitle && jobTitle.length > 1) {
+            this.User_Job_name = jobTitle;
+          // }
           //erm channel
           // if (!CommonService.SKIP)
           //   this.cs.navigateForward('/erm-channel/survey');
diff --git a/Mohem/src/app/app.module.ts b/Mohem/src/app/app.module.ts
index bce56c04..4f196c0f 100644
--- a/Mohem/src/app/app.module.ts
+++ b/Mohem/src/app/app.module.ts
@@ -8,16 +8,16 @@ import { StatusBar } from '@ionic-native/status-bar/ngx';
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { ZBar } from '@ionic-native/zbar/ngx';
-import { Geolocation } from '@ionic-native/geolocation/ngx';
+// import { ZBar } from '@ionic-native/zbar/ngx';
+// import { Geolocation } from '@ionic-native/geolocation/ngx';
 import {Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx';
 import { FilePath } from '@ionic-native/file-path/ngx';
 import { File } from '@ionic-native/file/ngx';
 import { Base64 } from '@ionic-native/base64/ngx';
 import { FirebaseX } from '@ionic-native/firebase-x/ngx';
 import { NgCalendarModule  } from 'ionic2-calendar';
-import { NFC, Ndef} from "@ionic-native/nfc/ngx" 
-import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx";
+// import { NFC, Ndef} from "@ionic-native/nfc/ngx" 
+// import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx";
 import { DigitalIdComponent } from './authentication/digital-id/digital-id.component';
 import { BusinessCardComponent } from './authentication/business-card/business-card.component';
 import { AppUpdateComponent } from './authentication/app-update/app-update.component';
@@ -38,17 +38,17 @@ import { AppUpdateComponent } from './authentication/app-update/app-update.compo
   providers: [
     StatusBar,
     SplashScreen,
-    ZBar,
-    Geolocation,
+    // ZBar,
+    // Geolocation,
     Camera,
     File,
     FilePath,
     Base64,
     FirebaseX,
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
-    NFC,
-    Ndef,
-    WifiWizard2
+    // NFC,
+    // Ndef,
+    // WifiWizard2
   ],
   bootstrap: [AppComponent]
 })
diff --git a/Mohem/src/app/attendance/home/home.component.ts b/Mohem/src/app/attendance/home/home.component.ts
index 4e9fe3dc..fb096330 100644
--- a/Mohem/src/app/attendance/home/home.component.ts
+++ b/Mohem/src/app/attendance/home/home.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { Geolocation } from '@ionic-native/geolocation/ngx';
-import { ZBar, ZBarOptions } from '@ionic-native/zbar/ngx';
+// import { Geolocation } from '@ionic-native/geolocation/ngx';
+// import { ZBar, ZBarOptions } from '@ionic-native/zbar/ngx';
 import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
 
 
@@ -11,28 +11,28 @@ import { TranslatorService } from 'src/app/hmg-common/services/translator/transl
 })
 export class HomeComponent implements OnInit {
 
-  zbarOptions: any;
+  // zbarOptions: any;
   scannedResult: any;
   lat: any;
   longt: any;
-  constructor(public ts: TranslatorService, private zbar: ZBar, private geolocation: Geolocation) {
+  constructor(public ts: TranslatorService) {
 
-    this.zbarOptions = {
-      flash: 'off',
-      drawSight: false
-    };
+    // this.zbarOptions = {
+    //   flash: 'off',
+    //   drawSight: false
+    // };
     console.log('your currnt location is');
-    this.geolocation.getCurrentPosition().then((resp) => {
-      // resp.coords.latitude
-      // resp.coords.longitude
-      // console.log("Loc 2");
-      console.log(resp.coords.latitude);
-      console.log(resp.coords.longitude);
-      this.lat = resp.coords.latitude;
-      this.longt = resp.coords.longitude;
-     }).catch((error) => {
-       console.log('Error getting location', error);
-     });
+    // this.geolocation.getCurrentPosition().then((resp) => {
+    //   // resp.coords.latitude
+    //   // resp.coords.longitude
+    //   // console.log("Loc 2");
+    //   console.log(resp.coords.latitude);
+    //   console.log(resp.coords.longitude);
+    //   this.lat = resp.coords.latitude;
+    //   this.longt = resp.coords.longitude;
+    //  }).catch((error) => {
+    //    console.log('Error getting location', error);
+    //  });
     this.scanCode();
    }
 
@@ -43,13 +43,13 @@ export class HomeComponent implements OnInit {
   }
 
   scanCode() {
-    this.zbar.scan(this.zbarOptions)
-   .then(result => {
-      console.log(result); // Scanned code
-      this.scannedResult = result;
-   })
-   .catch(error => {
-      alert(error); // Error message
-   });
+  //   this.zbar.scan(this.zbarOptions)
+  //  .then(result => {
+  //     console.log(result); // Scanned code
+  //     this.scannedResult = result;
+  //  })
+  //  .catch(error => {
+  //     alert(error); // Error message
+  //  });
   }
 }
diff --git a/Mohem/src/app/authentication/app-update/app-update.component.html b/Mohem/src/app/authentication/app-update/app-update.component.html
index 2c9482cf..3a878e6e 100644
--- a/Mohem/src/app/authentication/app-update/app-update.component.html
+++ b/Mohem/src/app/authentication/app-update/app-update.component.html
@@ -3,7 +3,7 @@
     <img src="assets/icon/update_rocket_image.png" style="width: 100%;" />
   </div>
   <div style="text-align: center;">
-    <img src="assets/imgs/CSLogo.png" />
+    <img style="height: 75px" src="assets/icon/moe-logo.png" />
   </div>
   <h1 style="text-align: center; font-weight: bold"> {{ 'general,app-update' | translate }}</h1>
 
@@ -15,7 +15,7 @@
     <ion-grid>
       <ion-row class="ion-justify-content-center">
         <ion-col [size]="11" [sizeLg]="8" [sizeXl]="6" no-padding>
-          <ion-button style="font-size: 16px !important; width:100%; --background: #259CB8; background: white;"  expand="block"
+          <ion-button style="font-size: 16px !important; width:100%; --background: #44a7a1; background: white;"  expand="block"
             (click)='dismiss()'>
             {{ 'general,update-now' | translate }}
           </ion-button>
diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html
index d0ea3dbc..bd96c5f7 100644
--- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html
+++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html
@@ -1,6 +1,7 @@
 <app-generic-header
   *ngIf="!accessFromOutSide"
   showBack="true"
+  [moeImage]="false"
   [headerText]="'login,verify-login' | translate">
 </app-generic-header>
 
@@ -31,9 +32,9 @@
          -->
       </ion-col>
     </ion-row>   
-    <div *ngIf="onlySMSBox"><p>{{ts.trPK('login','verify-login-with')}}</p></div>
-    <div *ngIf="!onlySMSBox && FFloginType == 2"><p>{{ts.trPK('login','verify-fingerprint')}}</p></div>
-    <div *ngIf="!onlySMSBox && FFloginType == 3"><p>{{ts.trPK('login','verify-faceId')}}</p></div>
+    <div *ngIf="onlySMSBox"><p class="p-color">{{ts.trPK('login','verify-login-with')}}</p></div>
+    <div *ngIf="!onlySMSBox && FFloginType == 2"><p class="p-color">{{ts.trPK('login','verify-fingerprint')}}</p></div>
+    <div *ngIf="!onlySMSBox && FFloginType == 3"><p class="p-color">{{ts.trPK('login','verify-faceId')}}</p></div>
 
         </ion-col>
       </ion-row> 
diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss b/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss
index ad2206df..11a47728 100644
--- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss
+++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss
@@ -2,12 +2,8 @@
     height: 25vh;
 }
 
-.rowOutside{
-   // margin-top: -37px;
 
-}
-
-.button-digital-id{
+.button-digital-id {
     --background: white !important;
     background: white !important;
     white-space: normal;
@@ -22,16 +18,21 @@
 }
 
 
-.digital-id-en{
+.digital-id-en {
     color: black;
     position: absolute;
     right: 20px;
     width: 10%;
- }
+}
 
- .digital-id-ar{
+.digital-id-ar {
     color: black;
     position: absolute;
     left: 20px;
     width: 10%;
- }
\ No newline at end of file
+}
+
+.p-color {
+    color: #004D71;
+    font-weight: bold;
+}
\ No newline at end of file
diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts
index 7c52dfea..1b7ea3d5 100644
--- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts
+++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts
@@ -17,7 +17,7 @@ import { CheckUserAuthenticationResponse } from 'src/app/hmg-common/services/aut
 import { LoginModel } from '../models/LoginModel';
 import * as moment from 'moment';
 import { CheckAppVersionResponse } from 'src/app/hmg-common/services/authentication/models/check-app-version.response';
-import { NFC } from "@ionic-native/nfc/ngx";
+// import { NFC } from "@ionic-native/nfc/ngx";
 import { DigitalIdComponent } from '../digital-id/digital-id.component';
 import { AppUpdateComponent } from '../app-update/app-update.component';
 import { Password } from '../models/password';
@@ -69,7 +69,7 @@ export class ConfirmLoginComponent implements OnInit {
     public platform: Platform,
     public modalController: ModalController,
     public alertController: AlertController,
-    private nfc: NFC,
+    // private nfc: NFC,
     private smsRetriever: SmsRetriever
   ) {
     this.loginData = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false);
@@ -353,20 +353,20 @@ export class ConfirmLoginComponent implements OnInit {
   }
 
   async checkNFCStatus() {
-    try {
-      let nfcStatus = await this.nfc.enabled();
-      console.log("nfc status >>>>>>>>>>" + nfcStatus);
-      this.isNFCAvailable = true;
-    } catch (err) {
-      console.log("Error reading tag", err);
-      if (err === "NO_NFC") {
-        this.isNFCAvailable = false;
-      } else if (err === "NFC_DISABLED") {
-        this.isNFCAvailable = true;
-      } else {
-        this.isNFCAvailable = false;
-      }
-    }
+    // try {
+    //   let nfcStatus = await this.nfc.enabled();
+    //   console.log("nfc status >>>>>>>>>>" + nfcStatus);
+    //   this.isNFCAvailable = true;
+    // } catch (err) {
+    //   console.log("Error reading tag", err);
+    //   if (err === "NO_NFC") {
+    //     this.isNFCAvailable = false;
+    //   } else if (err === "NFC_DISABLED") {
+    //     this.isNFCAvailable = true;
+    //   } else {
+    //     this.isNFCAvailable = false;
+    //   }
+    // }
   }
 
   public checkSMS() {
@@ -380,6 +380,7 @@ export class ConfirmLoginComponent implements OnInit {
     this.authService.checkSMS(request, () => { }, this.ts.trPK('general', 'ok'))
       .subscribe((result: SMSCheckResponse) => {
         if (this.cs.validResponse(result)) {
+        this.cs.sharedService.setSharedData(result.MemberLoginList.P_ORACLE_USER_NAME, 'oracle-user-name');
           this.businessInfo = {
             show_business: result.BusinessCardPrivilege,
             name_en: result.MemberInformationList[0].EMPLOYEE_NAME_En,
diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html
index 3ed9f510..a1f73ac2 100644
--- a/Mohem/src/app/authentication/login/login.component.html
+++ b/Mohem/src/app/authentication/login/login.component.html
@@ -7,7 +7,9 @@
             <div class="last-circle"></div>
         </div>
     </ion-row>
-
+    </ion-grid>
+    <div class="login-container">
+      <ion-grid>
     <ion-row>
       <ion-col *ngIf="!user">
         <P class="pageTitle text-caps">{{ts.trPK('login','login')}}</P>
@@ -16,13 +18,13 @@
   </ion-grid>
 
   <div *ngIf="!user" [dir]="currentLang==1 ?'rtl': 'ltr'">
-    <ion-item class="item-input-login">
+    <ion-item class="item-input-login" lines="none">
       <img style="margin: 9px 8px 9px 0 !important;" class="item-icon" src="assets/imgs/username.png" item-start />
       <ion-input class="login-input" required type="text" [(ngModel)]="username" placeholder="{{ts.trPK('login','username')}}">
       </ion-input>
     </ion-item>
 
-    <ion-item class="item-input-login">
+    <ion-item class="item-input-login" lines="none">
       <img style="margin: 9px 8px 9px 0 !important;" class="item-icon" src="assets/imgs/password.png" item-start />
       <ion-input class="login-input" required [type]="inputType" [(ngModel)]="password" placeholder="{{ts.trPK('login','password')}}">
       </ion-input>
@@ -34,21 +36,21 @@
       <a>{{ts.trPK('login','signup')}}</a>
     </div>
     <div ng class="gridDiv" aria-disabled="true">
-      <button  class="gridBtn"  ion-button (click)="changeLanguage('2')" [ngClass]="{'active':currentLang ==2}">English</button>
-        <button  class="gridBtn arTxt"  ion-button (click)="changeLanguage('1')" [ngClass]="{'active':currentLang ==1}">عربي</button>
+      <button  class="gridBtn border-moe-right"  ion-button (click)="changeLanguage('2')" [ngClass]="{'active':currentLang ==2}">English</button>
+        <button  class="gridBtn arTxt border-moe-left"  ion-button (click)="changeLanguage('1')" [ngClass]="{'active':currentLang ==1}">عربي</button>
     </div>
   </div>
 
-  
+  <div *ngIf="!user" class="centerDiv" style="margin: 25px 15px !important;">
+    <ion-button [ngClass]="{'disable-button-opacity': isValidForm()}" class="button-login" (click)="onLogin()" [disabled]="isValidForm()" style="width: 100% !important;">{{ts.trPK('login','login')}}</ion-button>
 
+</div>
   <!-- <div *ngIf="welcomeBack"> -->
     <welcome-login (onLogin)="login()" (loginWithUser)="loginWithUser()" *ngIf="user">
     </welcome-login>
   <!-- </div> -->
   
-  <div *ngIf="!user" class="centerDiv" style="margin: 25px 15px !important;">
-    <ion-button [ngClass]="{'disable-button-opacity': isValidForm()}" class="button-login" (click)="onLogin()" [disabled]="isValidForm()" style="width: 100% !important;">{{ts.trPK('login','login')}}</ion-button>
-
+  
     <!-- digital ID button -->
     <!-- <ion-button *ngIf="userInfo" class="button-digital-id" (click)="openDigitalId()">
       <p style="color: black;">{{ts.trPK('general','digital-id')}}</p> 
@@ -62,10 +64,20 @@
   </div>
 </ion-content>
 
-<ion-footer *ngIf="!user" [ngStyle]="keyboardOpened === true ? {'display': 'none'} : {}" style="padding: 0px;">
+<ion-footer *ngIf="!user" [ngStyle]="keyboardOpened === true ? {'display': 'none'} : {}" style="padding: 0px;" dir="ltr">
   <ion-row>
-      <ion-col class="colPad">
-        <img class="centerDiv logoFotor" src="../assets/imgs/CSLogo.png" />
+    <div class="footer-container">
+      <ion-col class="colPad" size="9" style="visibility: hidden">
+        
+        <img class="logoFotor" src="../assets/imgs/menu_mohemm_logo.png" />
+      </ion-col>
+      <ion-col class="colPad" size="3">
+        
+        <img class="moe-logo" src="../assets/icon/moe-logo.png" />
       </ion-col>
+    </div>
   </ion-row>
+  <div  class="menuFooter" >
+    <p class="companyTxt">{{companyDesc}}</p>
+  </div>
 </ion-footer>
\ No newline at end of file
diff --git a/Mohem/src/app/authentication/login/login.component.scss b/Mohem/src/app/authentication/login/login.component.scss
index 9e7d9149..44f773eb 100644
--- a/Mohem/src/app/authentication/login/login.component.scss
+++ b/Mohem/src/app/authentication/login/login.component.scss
@@ -23,6 +23,7 @@
     text-align: center;
     padding: 0px;
     margin: 0px;
+    font-weight: bold;
 }
 
 .TxtPlace {
@@ -97,10 +98,12 @@ img.centerDiv {
     }
 
     button.arTxt {
+        font-family: var(--fontFamilyIOSAR) !important;
+
         :root[dir="rtl"] {
             float: right;
             color: var(--customnavy) !important;
-            font-family: var(--fontFamilyIOSAR) !important;
+
             font-weight: bold;
             border-radius: 2px 0px 0px 2px !important;
         }
@@ -118,10 +121,11 @@ img.centerDiv {
 .login-input {
     border: none;
     margin-right: 5px;
+    font-family: 'Kufi';
 }
 
 .item-input {
-    --min-height: 1.0cm !important;
+    --min-height: 1.5cm !important;
     --border-radius: 12px;
     --ion-color-base: white !important;
     // --background: color: var(--darkgray) !important;
@@ -141,7 +145,7 @@ img.centerDiv {
     white-space: normal;
     color: var(--light);
     text-transform: capitalize;
-    min-height: 1.0cm;
+    min-height: 1.3cm;
     --border-radius: 33px !important;
     border-radius: 33px !important;
     --min-height: 1.6cm !important;
@@ -170,10 +174,10 @@ img.centerDiv {
 }
 
 .first-circle {
-    background: var(--newgreen) !important;
+    background: #024D71 !important;
     border-radius: 50%;
-    height: 292px;
-    width: 288px;
+    height: 310px;
+    width: 310px;
     float: left;
     margin-left: -55px;
     margin-top: -140px;
@@ -185,7 +189,7 @@ img.centerDiv {
     background: #c6903e !important;
     border-radius: 50%;
     height: 160px;
-    width: 170px;
+    width: 190px;
     margin: -115px 0px 0px 179px;
 }
 
@@ -198,11 +202,11 @@ img.centerDiv {
     margin: -147px 0px 0px 274px;
 }
 
-.logoFotor {
-    width: 45px !important;
-    height: 45px !important;
+// .logoFotor {
+//     width: 45px !important;
+//     height: 45px !important;
 
-}
+// }
 
 .welcomeText {
     justify-content: center;
@@ -271,4 +275,54 @@ img.centerDiv {
     position: absolute;
     left: 20px;
     width: 10%;
-}
\ No newline at end of file
+}
+
+
+.footer-container {
+    width: 100%;
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-align: stretch;
+    align-items: stretch;
+}
+
+.footer-container .logoFotor {
+    margin: 20px;
+    float: left;
+    width: 100px !important;
+    height: 30px !important;
+}
+
+.footer-container .moe-logo {
+    width: 45px;
+    float: right;
+    margin-right: 16px;
+    margin-top: 15px;
+}
+
+.border-moe-right {
+    border-top-right-radius: 16px;
+    border-bottom-right-radius: 16px;
+}
+
+.border-moe-left {
+    border-top-left-radius: 16px;
+    border-bottom-left-radius: 16px;
+}
+
+.menuFooter {
+    // position: fixed;
+    bottom: 0px;
+    text-align: center;
+    margin: auto;
+    width: 100%;
+    position: absolute;
+    top: 40px
+  }
+
+  .companyTxt {
+    font-size: 12px;
+    color: #004D71;
+    text-align: center;
+    font-family: 'Inter' !important;
+  }
\ No newline at end of file
diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts
index a3c7beac..0af2563e 100644
--- a/Mohem/src/app/authentication/login/login.component.ts
+++ b/Mohem/src/app/authentication/login/login.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, NgZone, OnDestroy } from '@angular/core';
 import { CommonService } from 'src/app/hmg-common/services/common/common.service';
 import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { AlertController, Platform, Events } from '@ionic/angular';
 import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
 import { CheckUserAuthenticationResponse } from 'src/app/hmg-common/services/authentication/models/check-user-auth.response';
@@ -22,6 +22,7 @@ import { ModalController } from '@ionic/angular';
 import { DigitalIdComponent } from '../digital-id/digital-id.component';
 import { AppUpdateComponent } from '../app-update/app-update.component';
 
+
 @Component({
     selector: 'login',
     templateUrl: './login.component.html',
@@ -30,6 +31,8 @@ import { AppUpdateComponent } from '../app-update/app-update.component';
 export class LoginComponent implements OnInit, OnDestroy {
     deviceToken1: any;
     userInfo: any;
+    companyDesc = 'Powered By Cloud Solutions';
+
 
     constructor(
         public cs: CommonService,
@@ -47,7 +50,9 @@ export class LoginComponent implements OnInit, OnDestroy {
         public plt: Platform,
         public pushService: PushService,
         public keyboardService: KeyboardService,
-        public modalController: ModalController
+        public modalController: ModalController,
+        public route:ActivatedRoute,
+       
     ) {
         this.events.subscribe('logoutFlage', logoutFlage => {
             console.log('login compont logoutFlage: ' + logoutFlage);
@@ -68,6 +73,13 @@ export class LoginComponent implements OnInit, OnDestroy {
         } else {
             this.user = false;
         }
+
+        
+       // this.route
+      //.params.subscribe(val => {
+
+        console.log("login page called init...")
+       
     }
 
     appLang = 1;
@@ -103,19 +115,25 @@ export class LoginComponent implements OnInit, OnDestroy {
     private checkUserResult: CheckUserAuthenticationResponse;
     public inputType = "password";
 
+
+   
     ngOnInit() {
         this.monitorKeyboardChange();
         this.userInfo = JSON.parse(localStorage.getItem('digitalIDUser'));
-        this.currentLang = TranslatorService.getCurrentLanguageCode();
-
-        if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) {
-            this.language = "US";
-            this.changeLanguage('2')
-        } else {
-            this.language = "AR";
-            this.changeLanguage('1')
-        }
-
+       
+        console.log("login page called...");
+      
+        var previousLanguage=  localStorage.getItem(TranslatorService.LNG_KEY);
+            if(previousLanguage){
+                this.currentLang = previousLanguage =='en' ? 2 : 1;
+            }else{
+                document.getElementById('lang').lang = 'en';
+                TranslatorService.CURRENT_LANGUAGE = TranslatorService.EN;
+                this.currentLang =2;
+            };
+          
+        
+      
         this.events.subscribe('user', user => { this.user = user; });
         this.deviceToken = this.cs.getDeviceToken();
         if (this.deviceToken) {
@@ -139,25 +157,31 @@ export class LoginComponent implements OnInit, OnDestroy {
         this.backClicked();
     }
 
+    start() {
+        this.cs.startLoading();
+    }
+    ngAfterViewInit(){
+       
+    }
     public changeLanguage(langNumber) {
         console.log("current lang: " + this.currentLang)
         console.log("click lang: " + langNumber)
-
         if (this.currentLang == langNumber) {
             this.currentLang = langNumber;
             return;
         } else {
             this.ts.switchLanguage();
-
+            // tslint:disable-next-line: triple-equals
             if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) {
                 this.language = 'US';
             } else {
                 this.language = 'AR';
             }
             this.currentLang = TranslatorService.getCurrentLanguageCode();
+
         }
         this.currentLang = langNumber;
-
+        document.getElementById('lang').lang = this.currentLang == 1 ? 'ar' : 'en';
     }
 
     public forgetPasswordPage() {
@@ -340,6 +364,14 @@ export class LoginComponent implements OnInit, OnDestroy {
         if (anotherUser) {
             this.username = '';
             this.password = '';
+            var previousLanguage=  localStorage.getItem(TranslatorService.LNG_KEY);
+            if(previousLanguage){
+                this.currentLang = previousLanguage =='en' ? 2 : 1;
+            }else{
+                document.getElementById('lang').lang = 'en';
+                TranslatorService.CURRENT_LANGUAGE = TranslatorService.EN;
+                this.currentLang =2;
+            };
         }
         console.log('login emit');
         console.log('login');
@@ -350,6 +382,14 @@ export class LoginComponent implements OnInit, OnDestroy {
 
     loginWithUser() {
         console.log('loginWithUser');
+        var previousLanguage=  localStorage.getItem(TranslatorService.LNG_KEY);
+        if(previousLanguage){
+            this.currentLang = previousLanguage =='en' ? 2 : 1;
+        }else{
+            document.getElementById('lang').lang = 'en';
+            TranslatorService.CURRENT_LANGUAGE = TranslatorService.EN;
+            this.currentLang =2;
+        };
         this.cs.openConfirmLoginPage();
     }
 
diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.html b/Mohem/src/app/authentication/sms-page/sms-page.page.html
index 854ab267..9ed67c7c 100644
--- a/Mohem/src/app/authentication/sms-page/sms-page.page.html
+++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html
@@ -5,7 +5,7 @@
 <app-generic-header
 
 showBack="true"
-
+[moeImage]="false"
 [headerText]="'verificationcode,verificationcode' | translate">
 
 </app-generic-header>
diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.scss b/Mohem/src/app/authentication/sms-page/sms-page.page.scss
index d50b0f62..19dd7c3b 100644
--- a/Mohem/src/app/authentication/sms-page/sms-page.page.scss
+++ b/Mohem/src/app/authentication/sms-page/sms-page.page.scss
@@ -56,8 +56,9 @@ ion-input {
     outline: none;
     width: 20%;
     transition: all .2s ease-in-out;
-    border-radius: 3px;
+    border-radius: 15px;
     display: inline-block;
+    --padding-start: 8px;
 
     &:focus {
         border-color: var(--ion-color-secondary) !important;
diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.ts b/Mohem/src/app/authentication/sms-page/sms-page.page.ts
index d92065bc..57d0feba 100644
--- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts
+++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts
@@ -24,7 +24,7 @@ import { GetLoginInfoRequest } from 'src/app/hmg-common/services/authentication/
 
 import * as moment from 'moment';
 
-import { NFC } from "@ionic-native/nfc/ngx";
+// import { NFC } from "@ionic-native/nfc/ngx";
 
 import { SmsRetriever } from '@ionic-native/sms-retriever/ngx';
 
@@ -125,7 +125,7 @@ export class SmsPageComponent implements OnInit {
 
     public platform: Platform,
 
-    private nfc: NFC,
+    // private nfc: NFC,
 
     private smsRetriever: SmsRetriever
 
@@ -367,33 +367,33 @@ export class SmsPageComponent implements OnInit {
 
   async checkNFCStatus() {
 
-    try {
+    // try {
 
-      let nfcStatus = await this.nfc.enabled();
+    //   let nfcStatus = await this.nfc.enabled();
 
-      console.log("nfc status >>>>>>>>>>" + nfcStatus);
+    //   console.log("nfc status >>>>>>>>>>" + nfcStatus);
 
-      this.isNFCAvailable = true;
+    //   this.isNFCAvailable = true;
 
-    } catch (err) {
+    // } catch (err) {
 
-      console.log("Error reading tag", err);
+    //   console.log("Error reading tag", err);
 
-      if (err === "NO_NFC") {
+    //   if (err === "NO_NFC") {
 
-        this.isNFCAvailable = false;
+    //     this.isNFCAvailable = false;
 
-      } else if (err === "NFC_DISABLED") {
+    //   } else if (err === "NFC_DISABLED") {
 
-        this.isNFCAvailable = true;
+    //     this.isNFCAvailable = true;
 
-      } else {
+    //   } else {
 
-        this.isNFCAvailable = false;
+    //     this.isNFCAvailable = false;
 
-      }
+    //   }
 
-    }
+    // }
 
   }
 
@@ -421,7 +421,7 @@ export class SmsPageComponent implements OnInit {
 
       if (this.common.validResponse(result)) {
 
-
+        this.common.sharedService.setSharedData(result.MemberLoginList.P_ORACLE_USER_NAME, 'oracle-user-name')
 
         //save business card info
 
diff --git a/Mohem/src/app/eit/add-cei/add-cei.component.scss b/Mohem/src/app/eit/add-cei/add-cei.component.scss
index 1b9699be..70f74b7a 100644
--- a/Mohem/src/app/eit/add-cei/add-cei.component.scss
+++ b/Mohem/src/app/eit/add-cei/add-cei.component.scss
@@ -1,9 +1,43 @@
 .footer-button {
-  border-radius: 2px;
-  padding: 0 1.1em;
-  min-height: 45px;
-  min-width: 200px;
-}
+    border-radius: 2px;
+    padding: 0 1.1em;
+    min-height: 45px;
+    min-width: 200px;
+  }
+  
+  ion-label {
+    color: var(--customnavy) !important;
+  }
+  
+  .daynamicForm-Label {
+    font-size: 16px;
+    color: #a2a5a6 !important;
+    display: block;
+    overflow: hidden;
+    -webkit-flex: 1;
+    flex: 1;
+    font-size: inherit;
+    white-space: normal;
+    padding: 5px 0px;
+    margin: 10px auto;
+    padding-left: 10px;
+  }
+  
+  
+  .header-toolbar-new{
+    --background: #BE332F;
+  }
+  .addEitOkButton{
+    white-space: normal !important;
+    text-transform: capitalize !important;
+    min-height: 45px !important;
+    min-width: 5px !important;
+    margin: 8px !important;
+    background-color: #BE332F;
+    width: 80% !important;
+    color: white!important;
+    border-radius: 16px !important;
+  }
 
 ion-label {
   color: var(--customnavy) !important;
diff --git a/Mohem/src/app/eit/add-cei/add-cei.component.ts b/Mohem/src/app/eit/add-cei/add-cei.component.ts
index 8d9ef1f6..498ced4b 100644
--- a/Mohem/src/app/eit/add-cei/add-cei.component.ts
+++ b/Mohem/src/app/eit/add-cei/add-cei.component.ts
@@ -177,7 +177,8 @@ export class AddCeiComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
             // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){// profile/ sql
             //   this.textInput = new TextInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED);
@@ -192,7 +193,8 @@ export class AddCeiComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
             // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){
             //   this.numberInput = new NumberInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED);
@@ -214,7 +216,8 @@ export class AddCeiComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.dateInput = new DateInput(
@@ -225,7 +228,8 @@ export class AddCeiComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
             // else if(feildsList[i].DEFAULT_TYPE=="D"){//current date
@@ -251,7 +255,8 @@ export class AddCeiComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.datetimeInput = new DateTimeInput(
@@ -262,7 +267,8 @@ export class AddCeiComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
             const elem = document.getElementById(
@@ -297,7 +303,8 @@ export class AddCeiComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.timeInput = new TimeInput(
@@ -308,7 +315,8 @@ export class AddCeiComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
           }
@@ -322,7 +330,8 @@ export class AddCeiComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else {
             // dropdown list missing open in differnt page
@@ -335,7 +344,8 @@ export class AddCeiComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
             // }else{
             //   this.selectInput = new SelectInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,"",containerId,feildsList[i].MOBILE_ENABLED);
diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts
index b57a1330..0e0e2ad4 100644
--- a/Mohem/src/app/eit/add-eit/add-eit.component.ts
+++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts
@@ -3,7 +3,7 @@ import { Component, OnInit, ViewChild, ElementRef } from "@angular/core";
 import { MenuEntry } from "src/app/hmg-common/services/menu/models/menu.entry";
 import { MenuResponse } from "src/app/hmg-common/services/menu/models/menu-response";
 import { EitRequest } from "../models/eit.request";
-import { ModalController } from "@ionic/angular";
+import { ModalController, Platform } from "@ionic/angular";
 import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service";
 import { EITTransactionsRequest } from "../models/EITTransactionsReq";
 import { EitService } from "../services/eit.service";
@@ -73,7 +73,8 @@ export class AddEitComponent implements OnInit {
     public cs: CommonService,
     private ts: TranslatorService,
     private eitService: EitService,
-    public datePicker: DatePicker
+    public datePicker: DatePicker,
+    public platform: Platform
   ) {
     this.direction = TranslatorService.getCurrentLanguageName();
     this.selEmp = this.cs.sharedService.getSharedData(
@@ -122,6 +123,10 @@ export class AddEitComponent implements OnInit {
         EITTransactionsRequest.SUBMIT_EIT_ACTION
       );
     }
+
+    // window.addEventListener('keyboardDidShow', () => {
+    //   document.activeElement.scrollIntoView(false);
+    // });
   }
 
   ngOnInit() {}
@@ -181,7 +186,8 @@ export class AddEitComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
             // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){// profile/ sql
             //   this.textInput = new TextInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED);
@@ -196,7 +202,8 @@ export class AddEitComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
             // }else if(feildsList[i].DEFAULT_TYPE=="P"||feildsList[i].DEFAULT_TYPE=="S"){
             //   this.numberInput = new NumberInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,this.getDefaultValue(feildsList[i].DESC_FLEX_NAME,feildsList[i].DESC_FLEX_CONTEXT_CODE,feildsList[i].SEGMENT_NAME,feildsList[i].PARENT_SEGMENTS_VS_SplitedVS,feildsList[i].PARENT_SEGMENTS_DV_Splited),containerId,feildsList[i].MOBILE_ENABLED);
@@ -218,7 +225,8 @@ export class AddEitComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.dateInput = new DateInput(
@@ -229,7 +237,8 @@ export class AddEitComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP,
               );
             }
             // else if(feildsList[i].DEFAULT_TYPE=="D"){//current date
@@ -255,7 +264,8 @@ export class AddEitComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.datetimeInput = new DateTimeInput(
@@ -266,7 +276,8 @@ export class AddEitComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
             const elem = document.getElementById(
@@ -301,7 +312,8 @@ export class AddEitComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.timeInput = new TimeInput(
@@ -312,7 +324,8 @@ export class AddEitComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
           }
@@ -326,7 +339,8 @@ export class AddEitComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else {
             // dropdown list missing open in differnt page
@@ -339,7 +353,8 @@ export class AddEitComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
             // }else{
             //   this.selectInput = new SelectInput(feildsList[i].SEGMENT_PROMPT,feildsList[i].APPLICATION_COLUMN_NAME,"",containerId,feildsList[i].MOBILE_ENABLED);
@@ -391,6 +406,8 @@ export class AddEitComponent implements OnInit {
     if (this.validateEitObj && this.validateEitObj.length > 0) {
       this.fillEITStructure();
     }
+
+    this.bindToolTip();
   }
 
   addFieldToDOM(
@@ -530,7 +547,18 @@ export class AddEitComponent implements OnInit {
     }
   }
 
+  bindToolTip () {
+    const toolTips = Array.from(document.getElementsByClassName('toolTip'));
+    toolTips.forEach(toolTip => {
+      toolTip.addEventListener('click', e => {
+        const toolTipData = toolTip.getAttribute("data-tooltip");
+        this.cs.yellowToast(toolTipData);
+      });
+    });
+  }
+
   bindHtmlElemEvents(id, obj) {
+    const isIOS = this.platform.is('ios');
     const elem = document.getElementById(id);
     console.log(elem);
     console.log(obj);
@@ -540,6 +568,18 @@ export class AddEitComponent implements OnInit {
     if (elemType == "SELECT") changeEvent = "change";
 
     try {
+
+      if (isIOS && (obj.FORMAT_TYPE == "N" || obj.FORMAT_TYPE == "C")) {
+        elem.addEventListener("ionFocus", event => {
+          setTimeout(()=>{
+            console.log(event.target as Element);
+            var e = event.target as Element;
+            e.scrollIntoView(true);
+          },1000)
+        })
+      }
+      
+      
       // elem.addEventListener("change", (e) => {
       elem.addEventListener(changeEvent, e => {
         //console.log("elem change "+elem.id);
@@ -548,6 +588,13 @@ export class AddEitComponent implements OnInit {
         //  if(!x.value)
         //   isEmpty=true;
         //emptyChildElement
+
+        if (obj.FORMAT_TYPE == "N") {
+          const maxSize = obj.MAXIMUM_SIZE;
+          const value = (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value;
+          (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value = value.length > maxSize ? value.substring(0, maxSize) : value;
+        }
+
         elem.classList.remove("requiredClassElm");
         if (
           obj.CHILD_SEGMENTS_VS_Splited &&
@@ -1231,6 +1278,7 @@ export class AddEitComponent implements OnInit {
           }
           if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) {
             elem.classList.add("requiredClassElm");
+            this.cs.redToastPK("eit", "required-text");
             //this.common.showRequiredMsg();
             return false;
           } else {
@@ -1269,6 +1317,7 @@ export class AddEitComponent implements OnInit {
           }
           if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !varcharValue) {
             x.classList.add("requiredClassElm");
+            this.cs.redToastPK("eit", "required-text");
             //this.common.showRequiredMsg();
             return false;
           } else {
@@ -1300,6 +1349,7 @@ export class AddEitComponent implements OnInit {
 
         if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) {
           x.classList.add("requiredClassElm");
+          this.cs.redToastPK("eit", "required-text");
           //this.common.showRequiredMsg();
           return false;
         } else {
diff --git a/Mohem/src/app/eit/cei-list/cei-list.component.scss b/Mohem/src/app/eit/cei-list/cei-list.component.scss
index 3c61a63f..7c7be96a 100644
--- a/Mohem/src/app/eit/cei-list/cei-list.component.scss
+++ b/Mohem/src/app/eit/cei-list/cei-list.component.scss
@@ -347,4 +347,4 @@ h4 {
   border-radius: 16px !important;
   --border-radius: 16px !important;
   --box-shadow: none;
-}
\ No newline at end of file
+}
diff --git a/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss b/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss
index b30d6c82..fec94464 100644
--- a/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss
+++ b/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss
@@ -272,4 +272,4 @@
   font-weight: bold;
   font-size: 16px;
   text-align: left;
-}
\ No newline at end of file
+}
diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html
index dcd0ec6b..f32f7e30 100644
--- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html
+++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html
@@ -1,9 +1,14 @@
-<ion-header>
+<!-- <ion-header>
   <ion-toolbar class="header-toolbar-new">
     <nav-buttons></nav-buttons>
     <ion-title [ngClass]=" direction === 'en' ?  'title' : 'title-ar'"  color="light">{{headerTitle}}</ion-title>
   </ion-toolbar>
-</ion-header>
+</ion-header> -->
+
+<app-generic-header
+  [showBack]="true"
+  [headerText]="headerTitle">
+</app-generic-header>
 
 
 <ion-content>
@@ -11,10 +16,14 @@
 <ion-grid>
   <ion-row style="margin-top: 20px;margin-left: 12px;">
   <ion-col>
-  <div size="10" [ngClass]=" direction === 'en' ?  'approvalTitle' : 'approvalTitle-ar'" >{{'general, addAttach' | translate}} <span *ngIf="isAttachment ==='Y'">*</span></div>
+    <div style="position: relative" size="10" [ngClass]=" direction === 'en' ?  'approvalTitle' : 'approvalTitle-ar'" >
+      {{'general, addAttach' | translate}}
+      <span *ngIf="isAttachment =='Y' || isAttachmentGET_MENU === 'Y'">*</span>
+      <div *ngIf="selMenu.GetMenuEntriesList.REQ_ATTACHMENT_TIP" (click)="showToolTip(selMenu.GetMenuEntriesList.REQ_ATTACHMENT_TIP)" class='toolTip-inside'><ion-icon style='font-size: 20px' name='information-circle-outline'></ion-icon> </div>
+    </div>
   </ion-col>
   <ion-col style="padding-left: 7%;" size="2">
-    <div class="fileDiv">
+    <div [ngClass]=" direction === 'en' ?  'fileDiv-en' : 'fileDiv-ar'">
        <input end class="inputfile" style="margin-top: 10px;z-index: 99999;position: absolute;opacity: 0;" type="file" ng2FileSelect [uploader]="uploader"
         (change)="onFileSelected($event)" (click)="onFileSelectedclick($event)" />
       <label end for="file" class="attachLable">
diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss
index ad8fbd92..11af957b 100644
--- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss
+++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss
@@ -272,4 +272,13 @@
   font-weight: bold;
   font-size: 16px;
   text-align: left;
-}
\ No newline at end of file
+}
+
+.fileDiv-en {
+  // float: right;
+}
+
+.fileDiv-ar {
+  float: left;
+}
+
diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts
index 4c176b62..00f229df 100644
--- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts
+++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts
@@ -62,7 +62,8 @@ export class ConfirmAddEitComponent implements OnInit {
   indexLastObj: any = 0;
   filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'];
   direction: string;
-  isAttachment: string;
+  isAttachment: string = 'N';
+  isAttachmentGET_MENU: string = 'N';
 
   constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService) {
     this.direction = TranslatorService.getCurrentLanguageName()
@@ -78,7 +79,7 @@ export class ConfirmAddEitComponent implements OnInit {
     this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false);
     this.eitRequest = this.cs.sharedService.getSharedData(EitRequest.SHARED_DATA, false);
     this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isResubmit;
-    this.isAttachment = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED;
+    this.isAttachmentGET_MENU = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED;
     if (this.isResubmitEIT) {
       this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING ** 
       // console.log("this.getPassNotificationDetails: " + this.getPassNotificationDetails);
@@ -102,7 +103,7 @@ export class ConfirmAddEitComponent implements OnInit {
       this.itemKey = this.addrespList.SubmitEITTransactionList.P_ITEM_KEY;
       this.P_TransactionID = this.addrespList.SubmitEITTransactionList.P_TRANSACTION_ID;
       this.isDelete = this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isDelete;
-
+      this.isAttachment = this.addrespList.SubmitEITTransactionList.P_ATTACHMENT_REQUIRED;
 
       this.getApproversList();
       //  this.confirmAddEit.submitEit(this.eitRequest).subscribe((result: AddEitResponse) => {
@@ -569,5 +570,9 @@ export class ConfirmAddEitComponent implements OnInit {
 
   // }
 
+  showToolTip(toolTip: any) {
+    this.cs.yellowToast(toolTip);
+  }
+
 
 }
diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html
index d94c8534..8e197250 100644
--- a/Mohem/src/app/eit/eit-list/eit-list.component.html
+++ b/Mohem/src/app/eit/eit-list/eit-list.component.html
@@ -181,6 +181,9 @@
     </ion-row>
     <h4> {{'general, noData' | translate}}</h4>
   </div>
+  <div class="terms" *ngIf="getPassMnuEntryObj.REQ_TIP && getResEITTransactionList[0]?.Collection_Transaction">
+    <p>{{getPassMnuEntryObj.REQ_TIP}}</p>
+  </div>
   <!-- <no-data *ngIf="!getResEITTransactionList || getResEITTransactionList[0]?.Collection_Transaction.length <= 0" txt="{{'general.noData' | translate}}"></no-data>  -->
   <div *ngIf="getResEITTransactionList && getResEITTransactionList[0]?.Collection_Transaction.length > 0 ">
   <!-- <div> -->
@@ -200,17 +203,20 @@
 
 
         <ion-grid>
-          <div>
-            <!-- <ion-row>
+          <!-- <div>
+            <ion-row>
               <ion-col class="colBold">
                 <label for="">status</label>
               </ion-col>
               <ion-col>
                 <label for="">{{EITTransactionList.status}}</label>
               </ion-col>
-            </ion-row> -->
-          </div>
+            </ion-row>
+          </div> -->
           <ion-grid class="grids">
+            <ion-col size="2" *ngIf="getPassMnuEntryObj.UPDATE_BUTTON == 'Y'" (click)="updateEITRrq(i)" >
+              <img [ngClass]="direction == 'en' ? 'icon-img':'icon-img-ar' " src="../assets/imgs/profile-icons/editing@2x.png" >
+            </ion-col>
           <div *ngFor="let item of EITTransactionList.Collection_Transaction">
             <!-- <ion-row *ngIf="item.DISPLAY_FLAG != 'N' ">
               <ion-col class="colBold">
@@ -223,7 +229,7 @@
             
               <ion-row  *ngIf="item.DISPLAY_FLAG != 'N' " class="">
                   <ion-col class="" *ngIf="item.SEGMENT_PROMPT!=''">
-                      <label style="color:#BE332F;font-weight: bold;" class="label" for="">{{item.SEGMENT_PROMPT}} </label>
+                      <label style="color:#024d71;font-weight: bold;" class="label" for="">{{item.SEGMENT_PROMPT}} </label>
                       <br>
                       <label  class="label" style="color:black;" for="">{{item.SEGMENT_VALUE_DSP}} </label>
                       <br>
@@ -246,7 +252,7 @@
   </ion-infinite-scroll>
 </div>
 </ion-content>
-<ion-icon class="addClass" name="add" (click)="addEITRrq()"></ion-icon>
+<ion-icon *ngIf="addButton == 'Y'" class="addClass" name="add" (click)="addEITRrq()"></ion-icon>
 
 <!-- <ion-footer>
   <div class="centerDiv"> -->
diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.scss b/Mohem/src/app/eit/eit-list/eit-list.component.scss
index 64b3805b..a39701df 100644
--- a/Mohem/src/app/eit/eit-list/eit-list.component.scss
+++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss
@@ -81,34 +81,34 @@ h4 {
   margin-bottom: -28px;
 }
 
-.header-toolbar-new {
+.header-toolbar-new{
   --background: #BE332F;
 }
 
-.addClass {
+.addClass{
   background-color: #BE332F;
-  width: 80px;
-  height: 80px;
-  right: 8%;
-  position: fixed;
-  color: white;
-  bottom: 5%;
-  border-radius: 50%;
-  z-index: 999;
-  -webkit-box-shadow: 2px -1px 13px 0px rgba(0, 0, 0, 0.59);
-  -moz-box-shadow: 2px -1px 13px 0px rgba(0, 0, 0, 0.59);
-  box-shadow: 2px -1px 13px 0px rgba(0, 0, 0, 0.59);
+      width: 80px;
+      height: 80px;
+      right: 8%;
+      position: fixed;
+      color: white;
+      bottom: 5%;
+      border-radius: 50%;
+      z-index: 999;
+      -webkit-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59);
+      -moz-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59);
+      box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59);
 }
 
 .contentEit:before {
   position: absolute;
-  content: "";
-  // background: #BE332F;
-  height: 140px;
-  width: 100%;
-  left: 0;
-  top: 0px;
-  z-index: 1;
+content: "";
+// background: #024d71;
+height: 140px;
+width: 100%;
+left: 0;
+top: 0px;
+z-index: 1;
 }
 
 .hrClass {
@@ -122,13 +122,13 @@ h4 {
 ////////////////////////////////
 .content:before {
   position: absolute;
-  content: "";
-  background: #BE332F;
-  height: 140px;
-  width: 100%;
-  left: 0;
-  top: 0px;
-  z-index: 1;
+content: "";
+background: #BE332F;
+height: 140px;
+width: 100%;
+left: 0;
+top: 0px;
+z-index: 1;
 }
 
 
@@ -349,4 +349,4 @@ h4 {
   display: inline-block;
   margin-right: 1px;
   margin-left: 5px;
-}
\ No newline at end of file
+}
diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.ts b/Mohem/src/app/eit/eit-list/eit-list.component.ts
index 09697be5..5f7f3bb3 100644
--- a/Mohem/src/app/eit/eit-list/eit-list.component.ts
+++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts
@@ -49,6 +49,7 @@ export class EitListComponent implements OnInit {
   accrualNetInfants: any;
   accrualUNetChild: any;
   accrualNetAdult: any;
+  addButton: string = 'Y';
 
   public options = {
     cutoutPercentage: 80,
@@ -81,6 +82,7 @@ export class EitListComponent implements OnInit {
 
   ngOnInit() {
     /////////////
+    this.addButton = this.selMenu.GetMenuEntriesList.ADD_BUTTON;
     this.Sdate = new Date().toISOString();
     this.getUserDetails();
     ////////////////up
@@ -229,9 +231,6 @@ export class EitListComponent implements OnInit {
     this.pAction = EIT_ACTION.UPDATE;
     this.cs.sharedService.setSharedData(this.getResEITTransactionList[i].Collection_Transaction, EITTransactionsRequest.SHARED_DATA);
     this.cs.sharedService.setSharedData(this.pAction, EITTransactionsRequest.SUBMIT_EIT_ACTION);
-    // this.fillEitTransactionTable(i);
-    // this.navCtrl.push("AddEitPage");
-    // this.openEit(i);
     this.openEitNew(i);
   }
   deleteEIT(i) {
diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html
index c4945b3d..abd89005 100644
--- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html
+++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html
@@ -1,25 +1,25 @@
-<ion-header>
-  <ion-toolbar class="header-toolbar-new">
-    <nav-buttons></nav-buttons>
-    <ion-title color="light">{{'eit, update-title' | translate}}</ion-title>
-  </ion-toolbar>
-</ion-header>
+<app-generic-header
+  showBack="true"
+  [headerText]="'eit, update-title' | translate">
+</app-generic-header>
 
 <ion-content padding>
   <!-- <button  ion-button   (click)="resubmitEit()">next</button> -->
   <div *ngIf="notificationBodyRes?.length > 0 ">
     <ion-card *ngFor="let item of notificationBodyRes; let i=index ">
-      <ion-card-header class="hrTitle">
+      <ion-card-header class="hrTitle" style="background: #024d71;">
 
         <div class="hrTitle">{{'worklistMain, notfDetails' | translate}} </div>
 
         <!-- <button ion-button icon-only *ngIf="item.Collection_Notification[0].ACTION!='DELETE_ROW'" (click)="updateEitNot(i)">
                 <ion-icon name="create"></ion-icon>
               </button> -->
-        <div class="editIconDiv"><button ion-button *ngIf="item.Collection_Notification[0].ACTION!='DELETE_ROW'" (click)="updateEitNot(i)">
-          <img class="imgSize" src="../assets/imgs/edit.png"></button>
+        <div [ngClass]=" direction === 'en' ?  'editIconDiv' : 'editIconDiv-ar'"><button style="background: #024d71;" ion-button *ngIf="item.Collection_Notification[0].ACTION!='DELETE_ROW'" (click)="updateEitNot(i)">
+          <img class="imgSize" src="../assets/imgs/profile-icons/editingWhite.png"></button>
         </div>
 
+        
+
 
           
       </ion-card-header>
diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss
index 15c88f0e..51c986c6 100644
--- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss
+++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss
@@ -1,19 +1,25 @@
-.addEitOkButton {
-  white-space: normal !important;
-  text-transform: capitalize !important;
-  min-height: 45px !important;
-  min-width: 5px !important;
-  margin: 8px !important;
-  background-color: #BE332F;
-  width: 80% !important;
-  color: white !important;
-  border-radius: 16px !important;
-  --border-radius: 16px !important;
-  --box-shadow: none;
-}
+.addEitOkButton{
+    white-space: normal !important;
+    text-transform: capitalize !important;
+    min-height: 45px !important;
+    min-width: 5px !important;
+    margin: 8px !important;
+    background-color: #BE332F;
+    width: 80% !important;
+    color: white!important;
+    border-radius: 16px !important;
+  }
 
-.editIconDiv {
-  right: 10px;
-  position: absolute;
-  top: 10px;
-}
\ No newline at end of file
+  .editIconDiv{
+    right: 10px;
+    position: absolute;
+    top: 10px;
+  }
+
+  .editIconDiv-ar{
+    left: 10px;
+    position: absolute;
+    top: 10px;
+  }
+
+  
diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts
index 98431cd3..b952ba64 100644
--- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts
+++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts
@@ -5,6 +5,7 @@ import { Component, OnInit } from '@angular/core';
 import { CommonService } from 'src/app/hmg-common/services/common/common.service';
 import { EITNotificatonBodyResponse } from '../models/EITNotificationBodyRes';
 import { EitService } from '../services/eit.service';
+import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service";
 
 @Component({
   selector: 'app-eit-update-list',
@@ -23,8 +24,9 @@ export class EitUpdateListComponent implements OnInit {
   private eitTransactionTbl: any = [];
   private eitRequest: EitRequest;
   private descFlex: string;
+  direction: string;
 
-  constructor(public cs: CommonService, public eitService: EitService, public modalController: ModalController) {
+  constructor(public cs: CommonService, public eitService: EitService, public modalController: ModalController, private ts: TranslatorService) {
     this.notificationBodyRes = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.SHARED_DATA, false);
     let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false);
     this.itemKey = notification.ITEM_KEY;
@@ -32,6 +34,7 @@ export class EitUpdateListComponent implements OnInit {
     this.functionName = notification.FUNCTION_NAME;
     this.selEmp = notification.SELECTED_EMPLOYEE_NUMBER;
     this.descFlex = notification.DESC_FLEX_CONTEXT_CODE;
+    this.direction = TranslatorService.getCurrentLanguageName();
     this.fillEitTransactionTable();
   }
 
@@ -67,12 +70,13 @@ export class EitUpdateListComponent implements OnInit {
   }
 
   updateTransactionList(list) {
-    list.forEach(element => {
-      const index = this.eitTransactionTbl.findIndex(x => x.TRANSACTION_NUMBER === element.TRANSACTION_NUMBER);
-      if (index != -1)
-        this.eitTransactionTbl.splice(index, 1);
-    });
-    this.eitTransactionTbl = this.eitTransactionTbl ? this.eitTransactionTbl.concat(list) : list;
+    // list.forEach(element => {
+    //   const index = this.eitTransactionTbl.findIndex(x => x.TRANSACTION_NUMBER === element.TRANSACTION_NUMBER);
+    //   if (index != -1)
+    //     this.eitTransactionTbl.splice(index, 1);
+    // });
+    // this.eitTransactionTbl = this.eitTransactionTbl ? this.eitTransactionTbl.concat(list) : list;
+    this.eitTransactionTbl = list;
   }
 
   resubmitEit() {
diff --git a/Mohem/src/app/hmg-common/hmg-common.module.ts b/Mohem/src/app/hmg-common/hmg-common.module.ts
index 2b8da3ac..650f4c15 100644
--- a/Mohem/src/app/hmg-common/hmg-common.module.ts
+++ b/Mohem/src/app/hmg-common/hmg-common.module.ts
@@ -21,7 +21,7 @@ import { TranslatePipe } from './pipes/translate/translate.pipe';
 import { DatePipeTransform } from './pipes/date/date.pipe';
 import { AlertControllerService } from './ui/alert/alert-controller.service';
 import { DateTimePipe } from './pipes/date-time/date-time.pipe';
-import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx';
+// import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx';
 import { LaunchNavigator } from '@ionic-native/launch-navigator/ngx';
 import { SafeHtmlPipe } from './pipes/safe-html/safe-html.pipe';
 import { BackButtonComponent } from './ui/back-button/back-button.component';
@@ -78,7 +78,7 @@ import { RouterModule } from '@angular/router';
 import { HeaderButtonComponent } from './ui/header-button/header-button.component';
 import { AppRate } from '@ionic-native/app-rate/ngx';
 import { RatingService } from './services/rating/rating.service';
-import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
+// import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { RateService } from './services/rate/rate.service';
 import { MenuService } from './services/menu/menuservice.service';
 import { ReplacementListComponent } from '../vacation-rule/replacement-list/replacement-list.component';
@@ -99,7 +99,7 @@ import { ConfirmLoginComponent } from '../authentication/confirm-login/confirm-l
 import { WelcomeComponent } from './ui/welcome-login/welcome.component'
 import { FabButtonComponent } from './ui/fab-button/fab-button.component'
 import { AttendScanService } from './services/attend-services/attend-scan.service';
-import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx';
+// import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx';
 import { NgCircleProgressModule } from 'ng-circle-progress';
 import { CardFilterComponent } from './ui/card-filter/card-filter.component';
 import { EmployeeInformationComponent } from './ui/employee-information/employee-information.component';
@@ -108,7 +108,7 @@ import { NgCalendarModule } from 'ionic2-calendar';
 import { DateInfoModalComponent } from './ui/circle-calendar/date-info-modal/date-info-modal.component';
 import { ChartModule } from 'primeng/chart';
 import { GenericHeaderComponent } from './ui/generic-header/generic-header.component';
-import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
+// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
 import { AttendanceOptionsComponent } from '../home/attendance-options/attendance-options.component';
 import { CardCalendarComponent } from './ui/card-calendar/card-calendar.component';
 import { WorklistSettingComponent } from '../notification/worklist-setting/worklist-setting.component';
@@ -287,7 +287,7 @@ import { SanitizeHtmlPipe } from '../itemforsale/services/domsafe';
         Globalization,
         SharedDataService,
         AlertControllerService,
-        ThemeableBrowser,
+        // ThemeableBrowser,
         LaunchNavigator,
         ProjectsService,
         NationalityService,
@@ -309,14 +309,14 @@ import { SanitizeHtmlPipe } from '../itemforsale/services/domsafe';
         Diagnostic,
         AppRate,
         RatingService,
-        InAppBrowser,
+        // InAppBrowser,
         RateService,
         Camera,
         File,
         MenuService,
         OpenNativeSettings,
-        BarcodeScanner,
-        BackgroundGeolocation,
+        // BarcodeScanner,
+        // BackgroundGeolocation,
         FileOpener,
         FilePath,
         FileChooser,
diff --git a/Mohem/src/app/hmg-common/hmg_utils.ts b/Mohem/src/app/hmg-common/hmg_utils.ts
index d29b9946..cf15a655 100644
--- a/Mohem/src/app/hmg-common/hmg_utils.ts
+++ b/Mohem/src/app/hmg-common/hmg_utils.ts
@@ -1,9 +1,9 @@
 import { Injectable } from "@angular/core";
-import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
+// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
 import { CommonService } from "src/app/hmg-common/services/common/common.service";
 import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service";
 import { DevicePermissionsService } from 'src/app/hmg-common/services/device-permissions/device-permissions.service';
-import { Geolocation } from '@ionic-native/geolocation/ngx';
+// import { Geolocation } from '@ionic-native/geolocation/ngx';
 import { Platform } from "@ionic/angular";
 
 declare const cordova: any;
@@ -13,10 +13,10 @@ declare const cordova: any;
 })
 export class HMGUtils {
     constructor(
-        public backgroundGeolocation: BackgroundGeolocation,
+        // public backgroundGeolocation: BackgroundGeolocation,
         public common: CommonService,
         public ts: TranslatorService,
-        private geolocation: Geolocation,
+        // private geolocation: Geolocation,
         public platform: Platform,
         public devicePermissionsService:DevicePermissionsService,
     ) { }
@@ -98,32 +98,32 @@ export class HMGUtils {
     }
 
     private getGMSLocation(callBack: Function) {
-        this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
-            if (resp && (resp.latitude && resp.longitude)) {
-                const isFakeLocation = resp.isFromMockProvider || resp.mockLocationsEnabled;
-                const lat = resp.latitude;
-                const long = resp.longitude;
-                callBack({"latitude":lat, "longitude":long, "isfake":isFakeLocation})
-            } else {
-                this.common.presentAlert(this.ts.trPK('home', 'position-error'));
-            }
-        }, (error) => {
-            this.common.presentAlert(this.ts.trPK('home', 'position-error'));
-        });
+        // this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
+        //     if (resp && (resp.latitude && resp.longitude)) {
+        //         const isFakeLocation = resp.isFromMockProvider || resp.mockLocationsEnabled;
+        //         const lat = resp.latitude;
+        //         const long = resp.longitude;
+        //         callBack({"latitude":lat, "longitude":long, "isfake":isFakeLocation})
+        //     } else {
+        //         this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+        //     }
+        // }, (error) => {
+        //     this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+        // });
     }
 
     private getIOSLocation(callBack: Function) {
-        this.geolocation.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }).then(resp => {
-            if (resp && resp.coords.latitude && resp.coords.longitude) {
-                const lat = resp.coords.latitude;
-                const long = resp.coords.longitude;
-                callBack({"latitude":lat, "longitude":long, "isfake":false})
-            } else {
-                this.common.presentAlert(this.ts.trPK('home', 'position-error'));
-            }
-        }).catch(error => {
-            this.common.presentAlert(this.ts.trPK('home', 'position-error'));
-        });
+        // this.geolocation.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }).then(resp => {
+        //     if (resp && resp.coords.latitude && resp.coords.longitude) {
+        //         const lat = resp.coords.latitude;
+        //         const long = resp.coords.longitude;
+        //         callBack({"latitude":lat, "longitude":long, "isfake":false})
+        //     } else {
+        //         this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+        //     }
+        // }).catch(error => {
+        //     this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+        // });
     }
 
 
diff --git a/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts b/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts
index 29c24f36..1b74485b 100644
--- a/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts
+++ b/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts
@@ -2,10 +2,10 @@ import { Injectable } from '@angular/core';
 // import { DevicePermissionsService } from '../device-permissions/device-permissions.service';
 import { DomSanitizer } from '@angular/platform-browser';
 import { SharedDataService } from '../shared-data-service/shared-data.service';
-import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx';
+// import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx';
 import { AttendanceService } from 'src/app/home/services/attendance.services';
-import { ZBar } from '@ionic-native/zbar/ngx';
-import { Geolocation } from '@ionic-native/geolocation/ngx';
+// import { ZBar } from '@ionic-native/zbar/ngx';
+// import { Geolocation } from '@ionic-native/geolocation/ngx';
 import { attendanceSwipeScannerRequest } from 'src/app/home/models/attendanceSwipe.Request';
 import { AuthenticatedUser } from '../authentication/models/authenticated-user';
 import { CommonService } from '../common/common.service';
@@ -14,7 +14,7 @@ import { Response } from 'src/app/hmg-common/services/models/response';
 import { Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx';
 import { DevicePermissionsService } from '../../services/device-permissions/device-permissions.service';
 import { Device } from '@ionic-native/device/ngx';
-import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
+// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
 import { Platform } from '@ionic/angular';
 import { ModalController } from '@ionic/angular';
 import { FirebaseX } from '@ionic-native/firebase-x/ngx';
@@ -37,17 +37,17 @@ export class AttendScanService {
   public collection = 'CS';
 
   constructor(private device: Device,
-              private zbar: ZBar,
-              private geolocation: Geolocation,
+              // private zbar: ZBar,
+              // private geolocation: Geolocation,
               private attendance_service: AttendanceService,
-              private barcodeScanner: BarcodeScanner,
+              // private barcodeScanner: BarcodeScanner,
               private cameraController: Camera,
               public sharedData: SharedDataService,
               private sanitizer: DomSanitizer,
               private permissions: DevicePermissionsService,
               public common: CommonService,
               public ts: TranslatorService,
-              public backgroundGeolocation: BackgroundGeolocation,
+              // public backgroundGeolocation: BackgroundGeolocation,
               public platform: Platform,
               public modalController: ModalController,
               public firebasex: FirebaseX,
@@ -135,22 +135,22 @@ export class AttendScanService {
     }
 
     scanCode() {
-      this.barcodeScanner
-        .scan()
-        .then(barcodeData => {
-          if (!barcodeData.cancelled) {
-            this.scannedResult = barcodeData;
-            this.deviceID = this.device.uuid;
-            if (this.isFakeLocationUsed) {
-              this.fakeSwipeAttendance();
-            } else {
-              this.swipeAttendance();
-            }
-          }
-        })
-        .catch(err => {
-          console.log('Error', err);
-        });
+      // this.barcodeScanner
+      //   .scan()
+      //   .then(barcodeData => {
+      //     if (!barcodeData.cancelled) {
+      //       this.scannedResult = barcodeData;
+      //       this.deviceID = this.device.uuid;
+      //       if (this.isFakeLocationUsed) {
+      //         this.fakeSwipeAttendance();
+      //       } else {
+      //         this.swipeAttendance();
+      //       }
+      //     }
+      //   })
+      //   .catch(err => {
+      //     console.log('Error', err);
+      //   });
     }
 
     fakeSwipeAttendance() {
diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
index 0a876022..d1b3e3e5 100644
--- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
+++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
@@ -107,14 +107,15 @@ export class AuthenticationService {
 
     this.setPublicFields(request);
     const user = this.getAuthenticatedUser();
-    if (user) {
+    const oracleUserName = this.cs.sharedService.getSharedData('oracle-user-name', false);
+    if (user && oracleUserName) {
       const userName = this.cs.sharedService.getSharedData(LoginRequest.SHARED_DATA, false);
       request.P_SESSION_ID = user.P_SESSION_ID;
       request.MobileNumber = user.EMPLOYEE_MOBILE_NUMBER;
       request.LogInTokenID = user.LogInTokenID;
       request.TokenID = user.TokenID;
-      request.P_USER_NAME = userName; // '1100313582' ALWAYS USER NAME 
-      request.UserName = userName; // '1100313582'
+      request.P_USER_NAME = oracleUserName; // '1100313582' ALWAYS USER NAME 
+      request.UserName = oracleUserName; // '1100313582'
       request.P_EMAIL_ADDRESS = user.EMPLOYEE_EMAIL_ADDRESS;
       if (AuthenticationService.requireRelogin) {
         this.sessionTimeOutDialog();
@@ -146,7 +147,7 @@ export class AuthenticationService {
     } else {
       mobileType = 'android';
     }
-    request.VersionID = 3.7;
+    request.VersionID = 1.0;
     request.Channel = 31;
     request.LanguageID = TranslatorService.getCurrentLanguageCode();
     request.MobileType = mobileType;
@@ -586,6 +587,7 @@ export class AuthenticationService {
   // tslint:disable-next-line: max-line-length
   public insertMobileLoginInfo(request: GetLoginInfoRequest, onError: any, errorLabel: string, isPostNoLoad = false): Observable<GetLoginInfoResponse> {
     this.authenticateRequest(request);
+    request.UserName = localStorage.getItem("user");
     if (isPostNoLoad) {
       return this.con.postNoLoad(AuthenticationService.insertMobileLoginInfo, request, onError, errorLabel);
     } else {
diff --git a/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts b/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts
index 68ca3ab7..9bc59635 100644
--- a/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts
+++ b/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts
@@ -3,6 +3,7 @@ import { Response } from 'src/app/hmg-common/services/models/response';
 import { AuthenticatedUser } from './authenticated-user';
 import { PrivilageModel } from './privilage-model';
 export class SMSCheckResponse extends Response {
+    MemberLoginList: any = {};
     BasicMemberInformation: any = {};
     AuthenticationTokenID: string;
     MemberInformationList:AuthenticatedUser[];
diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts
index 62bd7c23..28e80386 100644
--- a/Mohem/src/app/hmg-common/services/common/common.service.ts
+++ b/Mohem/src/app/hmg-common/services/common/common.service.ts
@@ -13,7 +13,7 @@ import { AlertControllerService } from '../../ui/alert/alert-controller.service'
 //import { Response } from "../models/response";
 import { Response } from 'src/app/hmg-common/services/models/response';
 import { Location, DatePipe } from '@angular/common';
-import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx';
+// import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx';
 import { BrowserConfig } from './models/browser-config';
 import {
   LaunchNavigator,
@@ -26,7 +26,7 @@ import { SharedDataService } from '../shared-data-service/shared-data.service';
 import { Badge } from '@ionic-native/badge/ngx';
 import { LifeCycleService } from '../life-cycle/life-cycle.service';
 import { Diagnostic } from '@ionic-native/diagnostic/ngx';
-import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
+// import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 
 @Injectable({
   providedIn: 'root'
@@ -105,7 +105,7 @@ export class CommonService {
     public toastController: ToastController,
     public alertController: AlertControllerService,
     public alertControllerIonic: AlertController,
-    public themeableBrowser: ThemeableBrowser,
+    // public themeableBrowser: ThemeableBrowser,
     public launchNavigation: LaunchNavigator,
     public platform: Platform,
     public device: Device,
@@ -113,7 +113,7 @@ export class CommonService {
     public badge: Badge,
     public lifeCycle: LifeCycleService,
     public diagnostic: Diagnostic,
-    public iab: InAppBrowser,
+    // public iab: InAppBrowser,
     private menu: MenuController,
   ) { }
 
@@ -243,6 +243,19 @@ export class CommonService {
     });
     toast.present();
   }
+
+  async yellowToast(message: string) {
+    const toast = await this.toastController.create({
+      message: message,
+      showCloseButton: true,
+      position: 'top',
+      duration: 3000,
+      color: 'warning',
+      closeButtonText: this.ts.trPK('general', 'close')
+    });
+    toast.present();
+  }
+
   async greenToast(message: string) {
     const toast = await this.toastController.create({
       message: message,
@@ -683,52 +696,52 @@ export class CommonService {
     onSuccess?,
     successURLS?: string[]
   ) {
-    this.platform.ready().then(() => {
-      const browser = this.iab.create(
-        url,
-        '_blank',
-        'closebuttoncolor=#60686b,hidenavigationbuttons=yes,hideurlbar=yes,zoom=no'
-      );
-
-      // browser.executeScript(...);
-
-      // browser.insertCSS(...);
-      browser.on('loaderror').subscribe(event => {
-        if (onFaild) {
-          onFaild();
-        }
-        browser.close();
-      });
-
-      /*
-            browser.on('loadstop').subscribe(event => {
-                // browser.insertCSS({ code: 'body{color: white;}' });
-                if (onSuccess) {
-                    onSuccess();
-                }
-            });
-            */
-
-      browser.on('exit').subscribe(event => {
-        if (onExit) {
-          onExit();
-        }
-      });
-
-      browser.on('loadstart').subscribe(event => {
-        if (successURLS) {
-          successURLS.forEach((successURL, index) => {
-            if (event.url && event.url.indexOf(successURL) >= 0) {
-              // alert('load start found success url');
-              browser.close();
-              if (onSuccess) {
-                onSuccess();
-              }
-            }
-          });
-        }
-      });
-    });
+    // this.platform.ready().then(() => {
+    //   const browser = this.iab.create(
+    //     url,
+    //     '_blank',
+    //     'closebuttoncolor=#60686b,hidenavigationbuttons=yes,hideurlbar=yes,zoom=no'
+    //   );
+
+    //   // browser.executeScript(...);
+
+    //   // browser.insertCSS(...);
+    //   browser.on('loaderror').subscribe(event => {
+    //     if (onFaild) {
+    //       onFaild();
+    //     }
+    //     browser.close();
+    //   });
+
+    //   /*
+    //         browser.on('loadstop').subscribe(event => {
+    //             // browser.insertCSS({ code: 'body{color: white;}' });
+    //             if (onSuccess) {
+    //                 onSuccess();
+    //             }
+    //         });
+    //         */
+
+    //   browser.on('exit').subscribe(event => {
+    //     if (onExit) {
+    //       onExit();
+    //     }
+    //   });
+
+    //   browser.on('loadstart').subscribe(event => {
+    //     if (successURLS) {
+    //       successURLS.forEach((successURL, index) => {
+    //         if (event.url && event.url.indexOf(successURL) >= 0) {
+    //           // alert('load start found success url');
+    //           browser.close();
+    //           if (onSuccess) {
+    //             onSuccess();
+    //           }
+    //         }
+    //       });
+    //     }
+    //   });
+    // });
   }
 
   public imageFromBase64(base64: string) {
@@ -1192,7 +1205,6 @@ export class CommonService {
     this.nav.navigateForward(['/eit/homepage']);
   }
   public openMyTeamPage() {
-    console.log('someeeeeeee');
     this.nav.navigateForward(['/my-team/home']);
   }
   public openMyTeamDetailPage() {
@@ -1350,9 +1362,13 @@ export class CommonService {
   public openAnnouncement() {
     this.nav.navigateForward(['/backend-integrations/announcement']);
   }
-  public openConcurrentReport() {
-
-    this.nav.navigateForward(['/reports/concurrent-report']);
+  public openConcurrentReport(value: boolean) {
+    const navigationExtras: NavigationExtras = {
+      queryParams: {
+        fromHome: value
+      }
+    };
+    this.nav.navigateForward(['/reports/concurrent-report'], navigationExtras);
   }
   public openConcurrentTransaction() {
 
@@ -1600,9 +1616,14 @@ export class CommonService {
   }
 
   public setFilterValues(data) {
-    for (const notification of data) {
-      this.filterKeys[notification.ITEM_TYPE] = notification.OPEN_NTF_NUMBER
+    if (data.length > 0) {
+      for (const notification of data) {
+        this.filterKeys[notification.ITEM_TYPE] = notification.OPEN_NTF_NUMBER
+      }
+    } else {
+      this.filterKeys['HRSSA'] = 0;
     }
+
   }
 
 
diff --git a/Mohem/src/app/hmg-common/services/common/models/browser-config.ts b/Mohem/src/app/hmg-common/services/common/models/browser-config.ts
index 8cb6822b..4a070f8d 100644
--- a/Mohem/src/app/hmg-common/services/common/models/browser-config.ts
+++ b/Mohem/src/app/hmg-common/services/common/models/browser-config.ts
@@ -1,64 +1,64 @@
-import { ThemeableBrowserOptions } from '@ionic-native/themeable-browser/ngx';
+// import { ThemeableBrowserOptions } from '@ionic-native/themeable-browser/ngx';
 
 export class BrowserConfig {
-    public static OPTIONS: ThemeableBrowserOptions = {
-        statusbar: {
-            color: '#ffffffff'
-        },
-        toolbar: {
-            height: 44,
-            color: '#f0f0f0ff'
-        },
-        title: {
-            color: '#003264ff',
-            showPageTitle: true
-        },
-        backButton: {
-            image: 'back',
-            imagePressed: 'back_pressed',
-            align: 'left',
-            event: 'backPressed'
-        },
-        forwardButton: {
-            image: 'forward',
-            imagePressed: 'forward_pressed',
-            align: 'left',
-            event: 'forwardPressed'
-        },
-        closeButton: {
-            image: 'close',
-            imagePressed: 'close_pressed',
-            align: 'left',
-            event: 'closePressed'
-        },
-        customButtons: [
-            {
-                image: 'share',
-                imagePressed: 'share_pressed',
-                align: 'right',
-                event: 'sharePressed'
-            }
-        ],
-        menu: {
-            image: 'menu',
-            imagePressed: 'menu_pressed',
-            title: 'Test',
-            cancel: 'Cancel',
-            align: 'right',
-            items: [
-                {
-                    event: 'helloPressed',
-                    label: 'Hello World!'
-                },
-                {
-                    event: 'testPressed',
-                    label: 'Test!'
-                }
-            ]
-        },
-        backButtonCanClose: true,
-        clearcache: true,
-        clearsessioncache: true,
-        disallowoverscroll: 'yes'
-    };
+    // public static OPTIONS: ThemeableBrowserOptions = {
+    //     statusbar: {
+    //         color: '#ffffffff'
+    //     },
+    //     toolbar: {
+    //         height: 44,
+    //         color: '#f0f0f0ff'
+    //     },
+    //     title: {
+    //         color: '#003264ff',
+    //         showPageTitle: true
+    //     },
+    //     backButton: {
+    //         image: 'back',
+    //         imagePressed: 'back_pressed',
+    //         align: 'left',
+    //         event: 'backPressed'
+    //     },
+    //     forwardButton: {
+    //         image: 'forward',
+    //         imagePressed: 'forward_pressed',
+    //         align: 'left',
+    //         event: 'forwardPressed'
+    //     },
+    //     closeButton: {
+    //         image: 'close',
+    //         imagePressed: 'close_pressed',
+    //         align: 'left',
+    //         event: 'closePressed'
+    //     },
+    //     customButtons: [
+    //         {
+    //             image: 'share',
+    //             imagePressed: 'share_pressed',
+    //             align: 'right',
+    //             event: 'sharePressed'
+    //         }
+    //     ],
+    //     menu: {
+    //         image: 'menu',
+    //         imagePressed: 'menu_pressed',
+    //         title: 'Test',
+    //         cancel: 'Cancel',
+    //         align: 'right',
+    //         items: [
+    //             {
+    //                 event: 'helloPressed',
+    //                 label: 'Hello World!'
+    //             },
+    //             {
+    //                 event: 'testPressed',
+    //                 label: 'Test!'
+    //             }
+    //         ]
+    //     },
+    //     backButtonCanClose: true,
+    //     clearcache: true,
+    //     clearsessioncache: true,
+    //     disallowoverscroll: 'yes'
+    // };
 }
diff --git a/Mohem/src/app/hmg-common/services/hmg-browser/hmg-browser.service.ts b/Mohem/src/app/hmg-common/services/hmg-browser/hmg-browser.service.ts
index a901e164..193ae520 100644
--- a/Mohem/src/app/hmg-common/services/hmg-browser/hmg-browser.service.ts
+++ b/Mohem/src/app/hmg-common/services/hmg-browser/hmg-browser.service.ts
@@ -1,74 +1,74 @@
 import { Injectable } from '@angular/core';
-import { ThemeableBrowser, ThemeableBrowserOptions, ThemeableBrowserObject } from '@ionic-native/themeable-browser/ngx';
+// import { ThemeableBrowser, ThemeableBrowserOptions, ThemeableBrowserObject } from '@ionic-native/themeable-browser/ngx';
 import { Platform } from '@ionic/angular';
 
 @Injectable({
   providedIn: 'root'
 })
 export class HmgBrowserService {
-  static options: ThemeableBrowserOptions = {
-    statusbar: {
-      color: '#ffffffff'
-    },
-    toolbar: {
-      height: 44,
-      color: '#f0f0f0ff'
-    },
-    title: {
-      color: '#60686b',
-      showPageTitle: true
-    },
-    backButton: {
-      image: 'back',
-      imagePressed: 'back_pressed',
-      align: 'left',
-      event: 'backPressed'
-    },
-    forwardButton: {
-      image: 'forward',
-      imagePressed: 'forward_pressed',
-      align: 'left',
-      event: 'forwardPressed'
-    },
-    closeButton: {
-      image: 'close',
-      imagePressed: 'close_pressed',
-      align: 'left',
-      event: 'closePressed'
-    },
-    /*
-    customButtons: [
-      {
-        image: 'share',
-        imagePressed: 'share_pressed',
-        align: 'right',
-        event: 'sharePressed'
-      }
-    ],
-    menu: {
-      image: 'menu',
-      imagePressed: 'menu_pressed',
-      title: 'Test',
-      cancel: 'Cancel',
-      align: 'right',
-      items: [
-        {
-          event: 'helloPressed',
-          label: 'Hello World!'
-        },
-        {
-          event: 'testPressed',
-          label: 'Test!'
-        }
-      ]
-    },
-    */
-    backButtonCanClose: true
-  };
+  // static options: ThemeableBrowserOptions = {
+  //   statusbar: {
+  //     color: '#ffffffff'
+  //   },
+  //   toolbar: {
+  //     height: 44,
+  //     color: '#f0f0f0ff'
+  //   },
+  //   title: {
+  //     color: '#60686b',
+  //     showPageTitle: true
+  //   },
+  //   backButton: {
+  //     image: 'back',
+  //     imagePressed: 'back_pressed',
+  //     align: 'left',
+  //     event: 'backPressed'
+  //   },
+  //   forwardButton: {
+  //     image: 'forward',
+  //     imagePressed: 'forward_pressed',
+  //     align: 'left',
+  //     event: 'forwardPressed'
+  //   },
+  //   closeButton: {
+  //     image: 'close',
+  //     imagePressed: 'close_pressed',
+  //     align: 'left',
+  //     event: 'closePressed'
+  //   },
+  //   /*
+  //   customButtons: [
+  //     {
+  //       image: 'share',
+  //       imagePressed: 'share_pressed',
+  //       align: 'right',
+  //       event: 'sharePressed'
+  //     }
+  //   ],
+  //   menu: {
+  //     image: 'menu',
+  //     imagePressed: 'menu_pressed',
+  //     title: 'Test',
+  //     cancel: 'Cancel',
+  //     align: 'right',
+  //     items: [
+  //       {
+  //         event: 'helloPressed',
+  //         label: 'Hello World!'
+  //       },
+  //       {
+  //         event: 'testPressed',
+  //         label: 'Test!'
+  //       }
+  //     ]
+  //   },
+  //   */
+  //   backButtonCanClose: true
+  // };
 
-  private browser: ThemeableBrowserObject;
+  // private browser: ThemeableBrowserObject;
   constructor(
-    private themeableBrowser: ThemeableBrowser,
+    // private themeableBrowser: ThemeableBrowser,
     private platform: Platform
   ) { }
 
@@ -81,18 +81,18 @@ export class HmgBrowserService {
   }
 
   private registerEvent(eventName: string, event: any) {
-    if (this.browser) {
-      this.browser.on(eventName).subscribe((data: any) => {
-        if (event) {
-          event();
-        }
-      });
-    }
+    // if (this.browser) {
+    //   this.browser.on(eventName).subscribe((data: any) => {
+    //     if (event) {
+    //       event();
+    //     }
+    //   });
+    // }
   }
 
   public openURLThemable(url: string) {
     this.platform.ready().then(() => {
-      this.browser = this.themeableBrowser.create(url, '_blank', HmgBrowserService.options);
+      // this.browser = this.themeableBrowser.create(url, '_blank', HmgBrowserService.options);
     });
   }
 
diff --git a/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts b/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts
index 8bb03e7b..964cf5f0 100644
--- a/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts
+++ b/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts
@@ -11,4 +11,5 @@ export class MenuEntry {
     public PROMPT: string;
     public REQUEST_TYPE: string;
     public ATTACHMENT_REQUIRED: string;
+    public REQ_ATTACHMENT_TIP: string;
 }
\ No newline at end of file
diff --git a/Mohem/src/app/hmg-common/services/translator/translator.service.ts b/Mohem/src/app/hmg-common/services/translator/translator.service.ts
index 00870278..ed4357e1 100644
--- a/Mohem/src/app/hmg-common/services/translator/translator.service.ts
+++ b/Mohem/src/app/hmg-common/services/translator/translator.service.ts
@@ -115,14 +115,18 @@ export class TranslatorService {
 
     public loadResources(onSuccess: any) {
         this.platform.ready().then(() => {
-            this.nativeStorage.getItem(TranslatorService.LNG_KEY).then((previousLanguage: string) => {
+          var previousLanguage=  localStorage.getItem(TranslatorService.LNG_KEY);
+            if(previousLanguage){
+          //  .then((previousLanguage: string) => {
                 TranslatorService.CURRENT_LANGUAGE = previousLanguage;
+                document.getElementById('lang').lang = previousLanguage;
                 this.loadTranslationAsset(onSuccess);
-            }, () => {
+            }else{
+                document.getElementById('lang').lang = 'en';
                 this.setCurrentLanguageToDefault();
                 this.loadTranslationAsset(onSuccess);
-            });
-
+            };
+          
         });
     }
 
@@ -179,18 +183,24 @@ export class TranslatorService {
     public setCurrentLanguage(language: string) {
         TranslatorService.CURRENT_LANGUAGE = language;
         this.events.publish(TranslatorService.CHANGE_EVENT);
-        this.nativeStorage.setItem(TranslatorService.LNG_KEY, language).then(() => {
-        }, () => { });
+        localStorage.setItem(TranslatorService.LNG_KEY, language);
     }
 
 
     public switchLanguage() {
 
-        this.nativeStorage.getItem(TranslatorService.LNG_KEY).then((previousLanguage: string) => {
-            this.setCurrentLanguage(this.getNextLanguage(previousLanguage));
-        }, () => {
-            this.setCurrentLanguage(this.getNextLanguage(TranslatorService.CURRENT_LANGUAGE));
-        });
+       // this.nativeStorage.getItem(TranslatorService.LNG_KEY).then((previousLanguage: string) => {
+       var lang =  localStorage.getItem(TranslatorService.LNG_KEY) 
+            if(lang){
+                this.setCurrentLanguage(this.getNextLanguage(lang));
+            }else{
+                this.setCurrentLanguage(this.getNextLanguage(TranslatorService.CURRENT_LANGUAGE));
+            }
+        
+      
+        //}, () => {
+           
+       // });
     }
 
     private getNextLanguage(currentLanguage: string) {
diff --git a/Mohem/src/app/hmg-common/ui/button/button.component.scss b/Mohem/src/app/hmg-common/ui/button/button.component.scss
index ec1fe4de..40ab6718 100644
--- a/Mohem/src/app/hmg-common/ui/button/button.component.scss
+++ b/Mohem/src/app/hmg-common/ui/button/button.component.scss
@@ -3,12 +3,10 @@
     margin-left: 2%;
     margin-right: 2%;
     height: 4cm;
-    box-shadow: 0px 0px 8px 2px #d5d5d5ab;
     background: white;
     margin-bottom: 0.3cm;
-    // border-color: #ececec;
-    border-style: solid;
-    border-width: 0.02cm;
+    border-radius: 30px !important;
+    border: 1.3px solid #8b8b8b;
 }
 
 // .custom-button:hover {
@@ -19,7 +17,7 @@
 
 
 
-.icon{
+.icon {
     margin-top: 0.7cm;
     margin-left: 27%;
     margin-right: 27%;
diff --git a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html
index 94ab6876..fee6d4a8 100644
--- a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html
+++ b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html
@@ -1,7 +1,7 @@
 <div class="main-container" [ngStyle]="active === true ? {'background': color} : {}">
   <div class="main-container-radius" [ngStyle]="active === true ? {'background-color': '#ffffff'} : {'background-color': color}"></div>
   <span *ngIf="text != 'All'" class="number-span" [ngStyle]="active === true ? {'color': '#ffffff'} : {}">{{value}}</span>
-  <span class="text-span" [ngStyle]="active === true ? {'color': '#ffffff'} : {}">{{text}}</span>
+  <span class="text-span text-span-moe" [ngStyle]="active === true ? {'color': '#ffffff'} : {}">{{text}}</span>
 </div>
 
 
diff --git a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts
index c414bc98..8e522d69 100644
--- a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts
+++ b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
+import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
 
 @Component({
   selector: 'app-card-filter',
@@ -11,8 +12,16 @@ export class CardFilterComponent implements OnInit {
   @Input() active: boolean;
   @Input() color: string;
 
+  direction: string;
+
   constructor() { }
 
-  ngOnInit() {}
+  ngOnInit() {
+    this.direction = TranslatorService.getCurrentLanguageName();
+    console.log(this.direction);
+    if (this.direction == 'ar') {
+      this.text = 'الموارد البشرية';
+    }
+  }
 
 }
diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss
index 35f168a6..2a821e20 100644
--- a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss
+++ b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss
@@ -111,4 +111,4 @@
     --height: 12cm !important;
     --width: 80% !important;
     --border-radius: 0.4cm;
-}
\ No newline at end of file
+}
diff --git a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss
index 09b14503..cf3ba641 100644
--- a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss
+++ b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss
@@ -1,186 +1,122 @@
-.team-member-container{
-    // background: white;
-    // border-radius: 100px 20px 20px 100px;
-    // margin-top: 15px;
-    // font-family: WorkSans-Regular;
-    // border: 1px solid #ccc;
-    // border-radius: 15px;
-    // padding-bottom: 8px;
+.team-member-container {
+
     background: white;
     /* margin-top: 2px; */
     font-family: WorkSans-Regular;
     border: 1px solid #ccc;
     border-radius: 15px;
-    padding-bottom: 8px;
-    margin-bottom: 7px;
+    padding-bottom: 5px;
+    margin-bottom: 15px;
+    box-shadow: 0px 1px 5px #cdcdcd;
 }
 
-// .user-image-container{
-//     position: relative;
-//     width: 70px;
-//     height: 70px;
-//     display: block;
-//     margin: 0 auto;
-//     &:before{
-//       position: absolute;
-//       content: "";
-//       width: 20px;
-//       height: 20px;
-//       border-radius: 20px;
-//       border: 1px solid white;
-//       top: 0;
-//       right: 0;
-//       background-color: red;
-//       z-index: 9;
-//   }
-//   &.present:before{
-//       background-color: green !important;
-//   }
-// }
-.user-image{
-    // overflow: hidden;
-    // position: relative;
-    // display: block;
-    //  width: 100%;
-    //  height: 100%;
-    // border-radius: 80px;
-    // border: 1px solid #ccc;
-    //  margin: 0px auto 6px;
+.user-image {
 
     img {
-        // width: 100%;
-        // max-height: 100%;
-        width: 74%;
-        max-height: 74%;
-        margin-top: 4px;
-        margin-left: 6px;
+        width: 60px;
+        height: 60px;
+
+        border-radius: 30px;
+        margin: 5px;
     }
 }
 
-.employee-name{
+.employee-name {
     display: inline-block;
     width: 80%;
-    .name{
-        // font-size: 16px;
-        // color: black;
-        // // margin: 0;
-        // width: 100%;
-        // text-overflow: ellipsis;
-        // white-space: nowrap;
-        // overflow: hidden;
-        // margin-left: -10px;
-        // margin-top: -5px;
-        // font-family: 'WorkSans-Bold';
-    font-size: 16px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    margin-left: -10px;
-    margin-top: -5px;
-    text-align: left;
-    font-family: var(--fontFamilyPoppins-SemiBold, inherit);
-    line-height: 25px;
-    letter-spacing: -0.64px;
-    color: #2B353E;
-    opacity: 1;
+
+    .name {
+
+        font-size: 16px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        margin-left: -10px;
+        margin-top: -5px;
+        text-align: left;
+        font-weight: bold;
+        line-height: 25px;
+        letter-spacing: -0.64px;
+        color: #2B353E;
+        opacity: 1;
+        font-family: 'Inter' !important;
     }
-    
-    .title{
-    //     font-size: 13px;
-    //     color: #888;
-    //     width: 100%;
-    //     text-overflow: ellipsis;
-    //     white-space: nowrap;
-    //     overflow: hidden;
-    //     display: block;
-    //     margin-left: -10px;
-    // margin-top: -6px;
-    // color: black;
-    font-family: var(--fontFamilyPoppins-SemiBold, inherit);
-    line-height: 12px;
-    letter-spacing: -0.56px;
-    color: #575757;
-    opacity: 1;
-    font-size: 14px;
-    width: 100%;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    display: block;
-    margin-left: -10px;
-    margin-top: -10px;
+
+    .title {
+
+        font-family: 'Inter' !important;
+        line-height: 12px;
+        letter-spacing: -0.56px;
+        color: #575757;
+        opacity: 1;
+        font-size: 14px;
+        width: 100%;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        // overflow: hidden;
+        display: block;
+        margin-left: -10px;
+        margin-top: -10px;
     }
 }
 
-.employee-name-ar{
+.employee-name-ar {
     display: inline-block;
     width: 80%;
-    .name{
-        // font-size: 16px;
-        // color: black;
-        // // margin: 0;
-        // width: 100%;
-        // text-overflow: ellipsis;
-        // white-space: nowrap;
-        // overflow: hidden;
-        // margin-left: -10px;
-        // margin-top: -5px;
-        // font-family: 'WorkSans-Bold';
-    font-size: 16px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    margin-left: -10px;
-    margin-top: -5px;
-    text-align: right;
-    font-family: var(--fontFamilyPoppins-SemiBold, inherit);
-    line-height: 25px;
-    letter-spacing: -0.64px;
-    color: #2B353E;
-    opacity: 1;
+
+    .name {
+        font-size: 16px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        margin-left: -10px;
+        margin-top: -5px;
+        text-align: right;
+        font-family: 'Inter' !important;
+        line-height: 25px;
+        letter-spacing: -0.64px;
+        color: #2B353E;
+        opacity: 1;
+        font-weight: bold;
     }
-    
-    .title{
-    //     font-size: 13px;
-    //     color: #888;
-    //     width: 100%;
-    //     text-overflow: ellipsis;
-    //     white-space: nowrap;
-    //     overflow: hidden;
-    //     display: block;
-    //     margin-left: -10px;
-    // margin-top: -6px;
-    // color: black;
-    font-family: var(--fontFamilyPoppins-SemiBold, inherit);
-    line-height: 12px;
-    letter-spacing: -0.56px;
-    color: #575757;
-    opacity: 1;
-    font-size: 14px;
-    width: 100%;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    display: block;
-    margin-left: -10px;
-    margin-top: -10px;
+
+    .title {
+
+        font-family: 'Inter' !important;
+        line-height: 12px;
+        letter-spacing: -0.56px;
+        color: #575757;
+        opacity: 1;
+        font-size: 14px;
+        width: 100%;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        // overflow: hidden;
+        display: block;
+        margin-left: -10px;
+        margin-top: -10px;
     }
 }
-.image-container{
+
+.image-container {
     width: 20%;
     display: inline-block;
     text-align: center;
     vertical-align: top;
     margin-top: 5px;
+    position: relative;
+    top: 12px;
 }
-.swipe-information{
+
+.swipe-information {
     color: #888;
     font-size: 12px;
     border-top: 1px solid #ccc;
     padding-top: 6px;
     margin-top: 6px;
+
     .check-in {
         font-size: 12px;
-                margin-right: 15px;
+        margin-right: 15px;
     }
 }
\ No newline at end of file
diff --git a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss
index ec6ceba7..5b0ddaf3 100644
--- a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss
+++ b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss
@@ -30,4 +30,4 @@
    color: white !important;
    width: 80px;
    height: 71px;
- }
\ No newline at end of file
+ }
diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html
index 40d6516a..3b0aae40 100644
--- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html
+++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html
@@ -12,6 +12,11 @@
             <img [src]="userImage"/>
           </div>
         </ion-col>
+        <ion-col *ngIf="!showImage && moeImage" [size]="2" style="padding: 0;">
+          <div class="profile-image-container">
+            <img src="../assets/icon/moe-logo.png"/>
+          </div>
+        </ion-col>
 
           <!-- *ngIf="getPassdirfromNotifiPage == true" -->
           <ion-col *ngIf="updateDirection"  [size]="2" style="padding: 0;" (click)="closeModal()">
@@ -19,7 +24,8 @@
                   <img style="
                   width: 20px;
                   height: 20px;
-                  margin-top: 5px;"
+                  position: absolute;
+                  top: -30px;"
                   [src]="close"
               />
                 </div>
diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts
index 404710f4..f27ee8fd 100644
--- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts
+++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts
@@ -13,6 +13,7 @@ import { TranslatorService } from '../../services/translator/translator.service'
   styleUrls: ['./generic-header.component.scss'],
 })
 export class GenericHeaderComponent implements OnInit {
+  @Input() moeImage = true;
   @Input() userImage = '';
   @Input() showImage = false;
   @Input() showMenu = false;
diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss
index 105de352..6c273a47 100644
--- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss
+++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss
@@ -1,24 +1,28 @@
 .custom-button {
     background: white;
-    margin-bottom: 0px;
-    border: 1px solid #ccc;
     border-radius: 20px;
     width: 100%;
     max-width: 105px;
     height: 100px;
     padding: 10px;
-    min-width: 96px;
+    min-width: 100px;
+    margin-bottom: 5px;
+    box-shadow: 0px 0px 5px #00000029;
+    margin-top: 2px;
 }
 
 .iconBox {
     display: block;
     width: 100%;
     position: static;
+    height: 40px;
 }
-.iconBox img{
-    margin: 0px auto 10px;
+
+.iconBox img {
+    margin: 0px auto 10px !important;
     display: block;
     width: 35px;
+    height: 33px;
     // max-width: 35%;
 }
 
@@ -26,10 +30,12 @@
     display: block;
 }
 
+
 .pClass {
-    font-size: 9px;
+    font-size: 8px;
     text-align: center;
     margin-top: 10px;
-    color: black;
+    color: #004D71;
     font-weight: bold;
+    letter-spacing: 0px;
 }
\ No newline at end of file
diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html
index f8c66193..a96cdce9 100644
--- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html
+++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html
@@ -6,7 +6,7 @@
     <ion-icon class="iconFab" name="finger-print"></ion-icon>
   </div>
   <div class="titleBox" [ngStyle]="link === '0' ? {'margin-left': '5px'} : {}">
-    <span>{{statsValue}}</span>
+    <span [ngStyle]="link === '4' ? {'visibility': 'hidden'} : {}">{{statsValue}}</span>
     <p class="pClass" [ngStyle]="link === '0' ? {'width': '105%', 'margin-top': '12px'} : {}">{{returnTitle(title)}}</p>
   </div>
 </div>
\ No newline at end of file
diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss
index 301515c1..e4b3a074 100644
--- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss
+++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss
@@ -1,12 +1,15 @@
 .custom-button {
+    box-shadow: 0px 0px 5px #00000029;
     background: white;
-    margin-bottom: 0px;
-    border: 1px solid #ccc;
+    margin-bottom: 5px;
     border-radius: 20px;
     width: 200px;
     max-width: 105px;
     height: 160px;
     padding: 10px;
+    @media screen and (min-width: 200px) and (max-width:300px) {
+        width: 80px;
+    }
 }
 
 .iconBox {
@@ -19,7 +22,7 @@
         // max-width: 45%;
         // padding-bottom: 5px;
         // padding-top: 5px;
-        display: block;
+        display: inline-block;
         max-width: 67%;
         padding-bottom: 9px;
         padding-top: 5px;
@@ -33,8 +36,8 @@
     span {
         font-size: 25px;
         font-weight: bold;
-        color: black;
-        text-align: -webkit-auto;
+        color: #004D71;
+        text-align: center;
         display: block;
     }
 }
@@ -44,13 +47,23 @@ ion-app[dir="rtl"] .titleBox {
 }
 
 .pClass {
-    color: black;
-    width: 85%;
+    // color: #004D71;
+    // width: 85%;
+    // margin-top: 5px;
+    // font-weight: bold;
+    // text-align: -webkit-auto;
+    // display: block;
+    // font-size: 15px !important;
+
+
+    color: #004D71;
+    width: 100%;
     margin-top: 5px;
     font-weight: bold;
-    text-align: -webkit-auto;
+    text-align: center;
     display: block;
-    font-size: 15px !important;
+    font-size: 14px !important;
+    letter-spacing: 0px;
 }
 
 .iconFab {
diff --git a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html
index d7178526..e655a1a3 100644
--- a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html
+++ b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html
@@ -1,4 +1,4 @@
-<ion-content has-bouncing="false" class="ion-no-padding" >
+<ion-content has-bouncing="false" class="ion-no-padding" style="position: inherit !important;">
   <ion-grid padding>
      <!-- <ion-row>
       <ion-col [size]="12">
@@ -13,7 +13,7 @@
 
 
 
-    <ion-row>
+    <ion-row style="margin-top: 50px;">
         <ion-col [size]="12">
           <h1 class="heading1">{{welcome}} </h1>
           <p *ngIf="!user" class="text1">{{welcome_txt}} </p>
diff --git a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.scss b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.scss
index 7677217e..33f2ac07 100644
--- a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.scss
+++ b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.scss
@@ -67,6 +67,10 @@
     line-height: 1.5;
 }
 
+.heading1{
+    font-size: 26px !important;
+}
+
 .button-digital-id{
     --background: white !important;
     background: white !important;
diff --git a/Mohem/src/app/home/attendance-options/attendance-options.component.ts b/Mohem/src/app/home/attendance-options/attendance-options.component.ts
index 76dd19f9..34dc4380 100644
--- a/Mohem/src/app/home/attendance-options/attendance-options.component.ts
+++ b/Mohem/src/app/home/attendance-options/attendance-options.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, NgZone, VERSION } from "@angular/core";
-import { NFC } from "@ionic-native/nfc/ngx";
+// import { NFC } from "@ionic-native/nfc/ngx";
 import { CommonService } from "src/app/hmg-common/services/common/common.service";
 import { Platform } from "@ionic/angular";
 import { AttendScanService } from "../../hmg-common/services/attend-services/attend-scan.service";
@@ -13,11 +13,11 @@ import { attendanceSwipeScannerRequest } from "src/app/home/models/attendanceSwi
 import { Device } from "@ionic-native/device/ngx";
 import { AttendanceService } from "src/app/home/services/attendance.services";
 import { Response } from "src/app/hmg-common/services/models/response";
-import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx";
+// import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx";
 import { OpenNativeSettings } from '@ionic-native/open-native-settings/ngx';
 import { DevicePermissionsService } from 'src/app/hmg-common/services/device-permissions/device-permissions.service';
-import { Geolocation } from '@ionic-native/geolocation/ngx';
-import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
+// import { Geolocation } from '@ionic-native/geolocation/ngx';
+// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
 import { FirebaseX } from '@ionic-native/firebase-x/ngx';
 import { HMGUtils } from 'src/app/hmg-common/hmg_utils';
 
@@ -53,7 +53,7 @@ export class AttendanceOptionsComponent implements OnInit {
 
 
   constructor(
-    private nfc: NFC,
+    // private nfc: NFC,
     public common: CommonService,
     public platform: Platform,
     public attendScanService: AttendScanService,
@@ -62,11 +62,11 @@ export class AttendanceOptionsComponent implements OnInit {
     private device: Device,
     private attendance_service: AttendanceService,
     public ngZone: NgZone,
-    private wifiWizard2: WifiWizard2,
+    // private wifiWizard2: WifiWizard2,
     private openNativeSettings: OpenNativeSettings,
     private devicePermissionsService:DevicePermissionsService,
-    private geolocation: Geolocation,
-    public backgroundGeolocation: BackgroundGeolocation,
+    // private geolocation: Geolocation,
+    // public backgroundGeolocation: BackgroundGeolocation,
     public hmgUtils: HMGUtils
   ) {}
 
@@ -88,31 +88,31 @@ export class AttendanceOptionsComponent implements OnInit {
   }
 
   async checkNFCStatus(checkValue: string) {
-    try {
-      let nfcStatus = await this.nfc.enabled();
-      console.log("nfc status >>>>>>>>>>" + nfcStatus);
-      if (nfcStatus === "NFC_OK") {
-        this.deviceNFC = true;
-        if (checkValue === "two") {
-          this.startNFC();
-        }
-      }
-      if (nfcStatus === null && checkValue === "two") {
-        this.startNFC();
-      }
-    } catch (err) {
-      console.log("Error reading tag", err);
-      if (err === "NO_NFC") {
-        this.deviceNFC = false;
-      } else if (err === "NFC_DISABLED") {
-        this.deviceNFC = true;
-        if (checkValue === "two") {
-          this.common.presentAlert(this.ts.trPK("general", "nfc-settings"));
-        }
-      } else if (checkValue === "two") {
-        this.common.presentAlert(this.ts.trPK("general", "nfc-error"));
-      }
-    }
+    // try {
+    //   let nfcStatus = await this.nfc.enabled();
+    //   console.log("nfc status >>>>>>>>>>" + nfcStatus);
+    //   if (nfcStatus === "NFC_OK") {
+    //     this.deviceNFC = true;
+    //     if (checkValue === "two") {
+    //       this.startNFC();
+    //     }
+    //   }
+    //   if (nfcStatus === null && checkValue === "two") {
+    //     this.startNFC();
+    //   }
+    // } catch (err) {
+    //   console.log("Error reading tag", err);
+    //   if (err === "NO_NFC") {
+    //     this.deviceNFC = false;
+    //   } else if (err === "NFC_DISABLED") {
+    //     this.deviceNFC = true;
+    //     if (checkValue === "two") {
+    //       this.common.presentAlert(this.ts.trPK("general", "nfc-settings"));
+    //     }
+    //   } else if (checkValue === "two") {
+    //     this.common.presentAlert(this.ts.trPK("general", "nfc-error"));
+    //   }
+    // }
   }
 
   public setServicesPrivilage() {
@@ -154,15 +154,15 @@ export class AttendanceOptionsComponent implements OnInit {
   }
 
   async startIOSNfc() {
-    try {
-      let tag = await this.nfc.scanTag();
-      console.log(JSON.stringify(tag));
-      const serialNumber = this.nfc.bytesToHexString(tag.id);
-      this.swipeAttendanceNFC(serialNumber);
-    } catch (err) {
-      this.common.presentAlert(this.ts.trPK("general", "nfc-error"));
-      console.log("Error reading tag", err);
-    }
+    // try {
+    //   let tag = await this.nfc.scanTag();
+    //   console.log(JSON.stringify(tag));
+    //   const serialNumber = this.nfc.bytesToHexString(tag.id);
+    //   this.swipeAttendanceNFC(serialNumber);
+    // } catch (err) {
+    //   this.common.presentAlert(this.ts.trPK("general", "nfc-error"));
+    //   console.log("Error reading tag", err);
+    // }
   }
 
   public async nfcModal() {
@@ -243,38 +243,38 @@ export class AttendanceOptionsComponent implements OnInit {
   public async startWifi() {
     const isAndroid = this.platform.is("android");
     const isIOS = this.platform.is("ios");
-    const isWifiEnabled = await this.wifiWizard2.isWifiEnabled();
+    // const isWifiEnabled = await this.wifiWizard2.isWifiEnabled();
     const versionType = this.device.version;
     const versionTypeInt = parseInt(versionType);
     console.log('version type: ' + versionType);
     console.log('version Type: ' + versionTypeInt);
     
     if(isAndroid && versionTypeInt > 10) {
-      if(!isWifiEnabled){
-        this.showWifiNotEnabled();
-        return;
-      }
+      // if(!isWifiEnabled){
+      //   this.showWifiNotEnabled();
+      //   return;
+      // }
     }
 
     if (isIOS) {
-      if(!isWifiEnabled){
-        this.showWifiNotEnabled();
-        return;
-      }
+      // if(!isWifiEnabled){
+      //   this.showWifiNotEnabled();
+      //   return;
+      // }
     } else if(isAndroid) {
       let locationPermission = await this.devicePermissionsService.requestLocationAutherization();
       if (!locationPermission) {
         return;
       }
 
-      if(!isWifiEnabled){
-        this.wifiWizard2.setWifiEnabled(true).then(()=>{
-          this.startWifi();
-        }).catch((err) => { 
-          console.debug(err);
-        });
-        return;
-    }
+    //   if(!isWifiEnabled){
+    //     this.wifiWizard2.setWifiEnabled(true).then(()=>{
+    //       this.startWifi();
+    //     }).catch((err) => { 
+    //       console.debug(err);
+    //     });
+    //     return;
+    // }
   }
   // opening wifi dailog if all above conditions are passed (isWifiEnabled == true)
   let modal = await this.modalController.create({
diff --git a/Mohem/src/app/home/home.module.ts b/Mohem/src/app/home/home.module.ts
index 6232673c..08469d11 100644
--- a/Mohem/src/app/home/home.module.ts
+++ b/Mohem/src/app/home/home.module.ts
@@ -5,7 +5,7 @@ import { Routes, RouterModule } from '@angular/router';
 import { HmgCommonModule } from '../hmg-common/hmg-common.module';
 import { IonicModule } from '@ionic/angular';
 import { HomePage } from './home.page';
-import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx';
+// import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx';
 import { WorklistMainService } from '../notification/service/work-list.main.service';
 import { AttendanceOptionsComponent } from './attendance-options/attendance-options.component';
 import { NfcModalComponent } from './nfc-modal/nfc-modal.component';
@@ -36,7 +36,7 @@ const routes: Routes = [
     WifiModalComponent
   ],
   providers: [
-    BarcodeScanner,
+    // BarcodeScanner,
     WorklistMainService
   ],
   entryComponents: [
diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html
index 97857bc4..bae37b5d 100644
--- a/Mohem/src/app/home/home.page.html
+++ b/Mohem/src/app/home/home.page.html
@@ -25,7 +25,7 @@
     </ion-slides>
     </ion-row>
 
-    <ion-row *ngFor="let menuItem of menuEntries;  let i=index">
+    <ion-row *ngFor="let menuItem of menuEntries;  let i=index" class="dynamic-form">
       <ion-col [size]="12">
             <ion-label class="menu-label">{{menuItem.PROMPT}}</ion-label>
       </ion-col>
@@ -61,6 +61,94 @@
       </ion-row>
     
   </ion-row>
+
+  <div *ngIf="!menuEntries">
+    <ion-list style="background: transparent; margin-bottom: 10px;">
+      <ion-list-header>
+        <ion-skeleton-text [animated]="true" style="width: 90px"></ion-skeleton-text>
+      </ion-list-header>
+      <ion-item lines="none" style="--background: transparent">
+        <ion-thumbnail slot="start" style="height: 100px; width: 100px">
+          <ion-skeleton-text [animated]="true"></ion-skeleton-text>
+        </ion-thumbnail>
+  
+        <ion-thumbnail slot="start" style="height: 100px; width: 100px">
+          <ion-skeleton-text [animated]="true"></ion-skeleton-text>
+        </ion-thumbnail>
+  
+        <ion-thumbnail slot="start" style="height: 100px; width: 100px">
+          <ion-skeleton-text [animated]="true"></ion-skeleton-text>
+        </ion-thumbnail>
+  
+      </ion-item>
+    </ion-list>
+    <div class="empty-div">
+      <ion-skeleton-text [animated]="true"></ion-skeleton-text>
+    </div>
+  
+    <ion-list style="background: transparent">
+      <ion-list-header>
+        <ion-skeleton-text [animated]="true" style="width: 90px"></ion-skeleton-text>
+      </ion-list-header>
+      <ion-item lines="none" style="--background: transparent">
+        <ion-thumbnail slot="start" style="height: 100px; width: 100px;">
+          <ion-skeleton-text [animated]="true"></ion-skeleton-text>
+        </ion-thumbnail>
+  
+        <ion-thumbnail slot="start" style="height: 100px; width: 100px">
+          <ion-skeleton-text [animated]="true"></ion-skeleton-text>
+        </ion-thumbnail>
+  
+        <ion-thumbnail slot="start" style="height: 100px; width: 100px">
+          <ion-skeleton-text [animated]="true"></ion-skeleton-text>
+        </ion-thumbnail>
+  
+      </ion-item>
+    </ion-list>
+  
+    <ion-list style="background: transparent">
+      <ion-list-header>
+        <ion-skeleton-text [animated]="true" style="width: 90px"></ion-skeleton-text>
+      </ion-list-header>
+      <ion-item lines="none" style="--background: transparent">
+        <ion-thumbnail slot="start" style="height: 100px; width: 100px">
+          <ion-skeleton-text [animated]="true"></ion-skeleton-text>
+        </ion-thumbnail>
+  
+        <ion-thumbnail slot="start" style="height: 100px; width: 100px">
+          <ion-skeleton-text [animated]="true"></ion-skeleton-text>
+        </ion-thumbnail>
+  
+        <ion-thumbnail slot="start" style="height: 100px; width: 100px">
+          <ion-skeleton-text [animated]="true"></ion-skeleton-text>
+        </ion-thumbnail>
+  
+      </ion-item>
+    </ion-list>
+  
+    <ion-list style="background: transparent">
+      <ion-list-header>
+        <ion-skeleton-text [animated]="true" style="width: 90px"></ion-skeleton-text>
+      </ion-list-header>
+      <ion-item lines="none" style="--background: transparent">
+        <ion-thumbnail slot="start" style="height: 100px; width: 100px">
+          <ion-skeleton-text [animated]="true"></ion-skeleton-text>
+        </ion-thumbnail>
+  
+        <ion-thumbnail slot="start" style="height: 100px; width: 100px">
+          <ion-skeleton-text [animated]="true"></ion-skeleton-text>
+        </ion-thumbnail>
+  
+        <ion-thumbnail slot="start" style="height: 100px; width: 100px">
+          <ion-skeleton-text [animated]="true"></ion-skeleton-text>
+        </ion-thumbnail>
+  
+      </ion-item>
+    </ion-list>
+  </div>
+
+
+
   <!-- <ion-row *ngIf="showStaticServices">
     <ion-col size="12">
       <ion-label>    {{'general,other-services' | translate}}  </ion-label>
diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss
index 6006d994..4a37714d 100644
--- a/Mohem/src/app/home/home.page.scss
+++ b/Mohem/src/app/home/home.page.scss
@@ -43,14 +43,17 @@ ion-title {
 
 ion-label {
     display: block;
-    color: black !important;
-    font-size: 14px;
+    color: #004D71 !important;
+    font-size: 16px;
     font-weight: bold;
+    letter-spacing: 0.16px;
+    // margin: 0px 10px 10px 10px;
 }
 
 .main-dashboard-container {
     position: relative;
     width: 100%;
+    --background: #f5f5f5;
 }
 
 .contentBg:before {
@@ -80,6 +83,8 @@ ion-label {
     width: 100%;
     margin-top: 25px;
     margin-bottom: 0px;
+    // margin-right: 10px !important;
+    margin-left: 5px !important;
 
     h3 {
         font-size: 18px;
@@ -90,6 +95,7 @@ ion-label {
     span {
         font-size: 13px;
         display: block;
+        margin-top: 5px;
     }
 
     img {
@@ -106,7 +112,7 @@ ion-label {
         --box-shadow: none !important;
         height: auto;
         min-height: inherit;
-        margin-top: 10px;
+        margin-top: 15px;
         font-size: 12px;
     }
 }
@@ -182,4 +188,19 @@ ion-label {
     img {
         width: 25px;
     }
+}
+
+ion-skeleton-text {
+    --border-radius: 15px;
+    --background: rgba(188, 0, 255, 0.065);
+    --background-rgb: 2, 77, 113;
+}
+
+.empty-div {
+    border-radius: 20px;
+    padding: 10px;
+    width: 100%;
+    margin-bottom: 20px;
+    margin-left: 5px !important;
+    height: 140px;
 }
\ No newline at end of file
diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts
index 0d7f1475..0f02c65a 100644
--- a/Mohem/src/app/home/home.page.ts
+++ b/Mohem/src/app/home/home.page.ts
@@ -7,8 +7,8 @@ import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/mo
 import { MenuService } from 'src/app/hmg-common/services/menu/menuservice.service';
 import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response';
 import { CommonService } from 'src/app/hmg-common/services/common/common.service';
-import { Geolocation } from '@ionic-native/geolocation/ngx';
-import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx';
+// import { Geolocation } from '@ionic-native/geolocation/ngx';
+// import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx';
 import { Device } from '@ionic-native/device/ngx';
 import { attendanceSwipeScannerRequest } from './models/attendanceSwipe.Request';
 import { COCRequest } from 'src/app/notification/models/COCRequest';
@@ -37,8 +37,8 @@ import { TimeCardService } from '../time-card/service/time-card.service';
 import { WorklistMainService } from '../notification/service/work-list.main.service';
 import { isThisISOWeek } from 'date-fns';
 import { Router } from '@angular/router';
-import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
-import { NFC, Ndef } from "@ionic-native/nfc/ngx"
+// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx';
+// import { NFC, Ndef } from "@ionic-native/nfc/ngx"
 import { DigitalIdComponent } from '../authentication/digital-id/digital-id.component';
 import { FirebaseX } from '@ionic-native/firebase-x/ngx';
 import { BusinessCardComponent } from "src/app/authentication/business-card/business-card.component";
@@ -54,7 +54,7 @@ export class HomePage implements OnInit {
   userData: any = {};
   userImage: any = '../assets/imgs/profile.png';
   menuList: any = [];
-  zbarOptions: any;
+  // zbarOptions: any;
   scannedResult: any;
   notBadge: any;
   lat: any;
@@ -66,6 +66,7 @@ export class HomePage implements OnInit {
   camera: boolean;
   ticketRequestObject: any;
   leaveRequestObject: any;
+  businessLeaveRequestObject: any;
   missingSwipeRequestObject: any;
   public isShow = false;
   public showVcationRule = false;
@@ -134,6 +135,7 @@ export class HomePage implements OnInit {
   direction: string;
   public isPostNoLoad = true;
   public showStaticServices = false;
+  public myRequestData: any;
 
   constructor(
     public ts: TranslatorService,
@@ -143,10 +145,10 @@ export class HomePage implements OnInit {
     public common: CommonService,
     public events: Events,
     private device: Device,
-    private geolocation: Geolocation,
+    // private geolocation: Geolocation,
     private attendanceService: AttendanceService,
     private eitService: EitService,
-    private barcodeScanner: BarcodeScanner,
+    // private barcodeScanner: BarcodeScanner,
     public actionSheetCtrl: ActionSheetController,
     public sharedData: SharedDataService,
     private sanitizer: DomSanitizer,
@@ -158,9 +160,9 @@ export class HomePage implements OnInit {
     public workListService: WorklistMainService,
     public router: Router,
     private platform: Platform,
-    public backgroundGeolocation: BackgroundGeolocation,
+    // public backgroundGeolocation: BackgroundGeolocation,
     public modalController: ModalController,
-    private nfc: NFC,
+    // private nfc: NFC,
     public firebasex: FirebaseX
   ) {
     this.events.subscribe('img-change', displayImg => {
@@ -196,7 +198,7 @@ export class HomePage implements OnInit {
       spaceBetween: 10
     };
     this.slideOptsTwo = {
-      slidesPerView: width > 320 ? 3.2 : 2.5,
+      slidesPerView: width > 320 ? 3.4 : 2.4,
       spaceBetween: width > 320 ? 10 : 5
     };
     this.showStaticServices = true;
@@ -271,32 +273,32 @@ export class HomePage implements OnInit {
       this.location = granted as boolean;
       if (this.location) {
         if (this.platform.is('android')) {
-          this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
-            if (resp && (resp.latitude && resp.longitude)) {
-              if (resp.isFromMockProvider || resp.mockLocationsEnabled) {
-                this.isFakeLocationUsed = true;
-              }
-              this.lat = resp.latitude;
-              this.longt = resp.longitude;
-              this.attendance();
-            } else {
-              this.common.presentAlert(this.ts.trPK('home', 'position-error'));
-            }
-          }, (error) => {
-            this.common.presentAlert(this.ts.trPK('home', 'position-error'));
-          });
+          // this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => {
+          //   if (resp && (resp.latitude && resp.longitude)) {
+          //     if (resp.isFromMockProvider || resp.mockLocationsEnabled) {
+          //       this.isFakeLocationUsed = true;
+          //     }
+          //     this.lat = resp.latitude;
+          //     this.longt = resp.longitude;
+          //     this.attendance();
+          //   } else {
+          //     this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+          //   }
+          // }, (error) => {
+          //   this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+          // });
         } else {
-          this.geolocation.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }).then(resp => {
-            if (resp && resp.coords.latitude && resp.coords.longitude) {
-              this.lat = resp.coords.latitude;
-              this.longt = resp.coords.longitude;
-              this.attendance();
-            } else {
-              this.common.presentAlert(this.ts.trPK('home', 'position-error'));
-            }
-          }).catch(error => {
-            this.common.presentAlert(this.ts.trPK('home', 'position-error'));
-          });
+          // this.geolocation.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }).then(resp => {
+          //   if (resp && resp.coords.latitude && resp.coords.longitude) {
+          //     this.lat = resp.coords.latitude;
+          //     this.longt = resp.coords.longitude;
+          //     this.attendance();
+          //   } else {
+          //     this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+          //   }
+          // }).catch(error => {
+          //   this.common.presentAlert(this.ts.trPK('home', 'position-error'));
+          // });
         }
       } else {
         return false;
@@ -309,7 +311,7 @@ export class HomePage implements OnInit {
       if (servicePrivilage.Previlege === false) {
         if (servicePrivilage.ServiceName === 'accrualBalance') {
           this.statsButtons[3].show = false;
-          this.statsButtons[4].show = false;
+          // this.statsButtons[4].show = false;
         }
         if (servicePrivilage.ServiceName === 'vacationRule') {
           this.showVcationRule = false;
@@ -432,6 +434,10 @@ export class HomePage implements OnInit {
       } else {
         this.events.publish('myTeamFlag', 'false');
       }
+
+      if (this.menuList[i].MENU_TYPE === 'E') {
+        this.myRequestData = this.menuList[i];
+      }
     }
 
     // if (item.MENU_TYPE === 'M') {
@@ -517,6 +523,10 @@ export class HomePage implements OnInit {
             // tslint:disable-next-line: triple-equals
           } else if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'HMG_OTL_MISSING_SWIPE_EIT_SS') {
             this.missingSwipeRequestObject = result.GetMenuEntriesList[i];
+          } else if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'XXX_HR_EIT_BUSINESS_MISSION_SS') {
+            this.businessLeaveRequestObject = result.GetMenuEntriesList[i];
+          } else if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'MBL_PERFORMANCE_MANAGEMENT' && result.GetMenuEntriesList[i].REQUEST_TYPE == 'PMS') {
+            result.GetMenuEntriesList.splice(i, 1);
           }
         }
         this.sortMenuEntires(result.GetMenuEntriesList);
@@ -546,22 +556,22 @@ export class HomePage implements OnInit {
   }
 
   scanCode() {
-    this.barcodeScanner
-      .scan()
-      .then(barcodeData => {
-        if (!barcodeData.cancelled) {
-          this.scannedResult = barcodeData;
-          this.deviceID = this.device.uuid;
-          if (this.isFakeLocationUsed) {
-            this.fakeSwipeAttendance();
-          } else {
-            this.swipeAttendance();
-          }
-        }
-      })
-      .catch(err => {
-        console.log('Error', err);
-      });
+    // this.barcodeScanner
+    //   .scan()
+    //   .then(barcodeData => {
+    //     if (!barcodeData.cancelled) {
+    //       this.scannedResult = barcodeData;
+    //       this.deviceID = this.device.uuid;
+    //       if (this.isFakeLocationUsed) {
+    //         this.fakeSwipeAttendance();
+    //       } else {
+    //         this.swipeAttendance();
+    //       }
+    //     }
+    //   })
+    //   .catch(err => {
+    //     console.log('Error', err);
+    //   });
   }
 
   fakeSwipeAttendance() {
@@ -786,7 +796,7 @@ export class HomePage implements OnInit {
     // if (subMenu.REQUEST_TYPE === 'EIT' && subMenu.FUNCTION_NAME === 'XXX_HR_EIT_LOA_CREATE_SS') {
     if (subMenu.REQUEST_TYPE === 'EIT') {
       // this.common.openAbsencePage();
-         this.common.openEitListPage();
+      this.common.openEitListPage();
     } else if (subMenu.REQUEST_TYPE === 'EIT') {
       this.common.openEitListPage();
     } else if (subMenu.REQUEST_TYPE === 'PAYSLIP') {
@@ -803,6 +813,11 @@ export class HomePage implements OnInit {
       this.common.openProfile('contact');
     } else if (subMenu.REQUEST_TYPE === 'CONTACT') {
       this.common.openProfile('family');
+    } else if (subMenu.REQUEST_TYPE === 'PAR') {
+      this.performanceEvaluation();
+    } else if (subMenu.REQUEST_TYPE === 'CCP') {
+      this.common.sharedService.setSharedData(subMenu, MenuResponse.SELECTED_MENU);
+      this.common.openConcurrentReport(true);
     }
     if (subMenu.REQUEST_TYPE === 'TIME_CARD') {
       this.common.openTimeCardPage();
@@ -825,11 +840,13 @@ export class HomePage implements OnInit {
         let totalTicketsLeft = 0;
         this.accrualBalancesList = result.GetAccrualBalancesList;
         for (const accrualBalance of result.GetAccrualBalancesList) {
-          if (accrualBalance.ACCURAL_PLAN_NAME === 'Annual Vacation Accrual') {
+          if (accrualBalance.ACCURAL_PLAN_NAME === 'Annual Vacation Accrual' || accrualBalance.ACCURAL_PLAN_NAME == "  خطة استحقاق الاجازة الاعتيادية") {
             this.statsButtons[1].statsValue = accrualBalance.ACCRUAL_NET_ENTITLEMENT === null ? 0 : Number(accrualBalance.ACCRUAL_NET_ENTITLEMENT.toFixed(2));
             this.common.sharedService.setSharedData(accrualBalance, 'leaveAccrualBalance');
             this.common.sharedService.setSharedData(request, 'leaveAccrualBalanceDate');
             // this.common.sharedService.setSharedData(this.accrualBalancesList, 'tickitsbalance');
+          } else if (accrualBalance.ACCURAL_PLAN_NAME === 'Business Trip Accrual' || accrualBalance.ACCURAL_PLAN_NAME == "خطة استحقاق الإنتدابات") {
+            this.statsButtons[2].statsValue = accrualBalance.ACCRUAL_NET_ENTITLEMENT === null ? 0 : Number(accrualBalance.ACCRUAL_NET_ENTITLEMENT.toFixed(2));
           }
           // else {
           //   totalTicketsLeft = totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT;
@@ -852,14 +869,10 @@ export class HomePage implements OnInit {
     // tslint:disable-next-line: triple-equals
     if (link == '0') {
       this.isFakeLocationUsed = false;
-      // this.getDeviceLocation();
       this.showAttendanceOptions();
-      // tslint:disable-next-line: triple-equals
     } else if (link == '1') {
-      // this.common.sharedService.setSharedData(this.statsButtons[1].statsValue, 'total-count');
       this.common.startLoading();
       this.common.openNotificationPage();
-      // tslint:disable-next-line: triple-equals
     } else if (link == '2') {
       // this.openPage(this.missingSwipeRequestObject);
       // tslint:disable-next-line: triple-equals
@@ -897,4 +910,8 @@ export class HomePage implements OnInit {
   openAnnouncement() {
     this.common.openAnnouncement();
   }
+
+  public performanceEvaluation() {
+    this.common.openPerformanceevaluation();
+  }
 }
diff --git a/Mohem/src/app/home/nfc-modal/nfc-modal.component.ts b/Mohem/src/app/home/nfc-modal/nfc-modal.component.ts
index c5d761ef..3d0aec4d 100644
--- a/Mohem/src/app/home/nfc-modal/nfc-modal.component.ts
+++ b/Mohem/src/app/home/nfc-modal/nfc-modal.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, NgZone } from '@angular/core';
-import { NFC } from "@ionic-native/nfc/ngx" 
+// import { NFC } from "@ionic-native/nfc/ngx" 
 import { CommonService } from 'src/app/hmg-common/services/common/common.service';
 import {AttendScanService} from '../../hmg-common/services/attend-services/attend-scan.service';
 import { attendanceSwipeScannerRequest } from 'src/app/home/models/attendanceSwipe.Request';
@@ -24,7 +24,7 @@ export class NfcModalComponent implements OnInit {
   public longt: number;
 
   constructor(
-    private nfc: NFC,
+    // private nfc: NFC,
     public common: CommonService,
     public attendScanService: AttendScanService,
     private device: Device,
@@ -45,15 +45,15 @@ export class NfcModalComponent implements OnInit {
   }
 
   async startAndroidNfc() {
-    let flags = this.nfc.FLAG_READER_NFC_A | this.nfc.FLAG_READER_NFC_V;
-    this.nfcReader = this.nfc.readerMode(flags).subscribe((tag) => {
-      const serialNumber = this.nfc.bytesToHexString(tag.id);
-      this.swipeAttendanceNFC(serialNumber);
-    }, (error) => {      
-      this.modalController.dismiss();
-      this.common.presentAlert(this.ts.trPK('general', 'nfc-error'));
-      console.log('error =====>>>>>> + + + =' + error);
-    });
+    // let flags = this.nfc.FLAG_READER_NFC_A | this.nfc.FLAG_READER_NFC_V;
+    // this.nfcReader = this.nfc.readerMode(flags).subscribe((tag) => {
+    //   const serialNumber = this.nfc.bytesToHexString(tag.id);
+    //   this.swipeAttendanceNFC(serialNumber);
+    // }, (error) => {      
+    //   this.modalController.dismiss();
+    //   this.common.presentAlert(this.ts.trPK('general', 'nfc-error'));
+    //   console.log('error =====>>>>>> + + + =' + error);
+    // });
   }​
 
   public swipeAttendanceNFC (nfcSerialCode: any) {
diff --git a/Mohem/src/app/home/wifi-model/wifi-modal.component.ts b/Mohem/src/app/home/wifi-model/wifi-modal.component.ts
index a7b722b4..bed19073 100644
--- a/Mohem/src/app/home/wifi-model/wifi-modal.component.ts
+++ b/Mohem/src/app/home/wifi-model/wifi-modal.component.ts
@@ -8,7 +8,7 @@ import { Response } from 'src/app/hmg-common/services/models/response';
 import { ModalController } from '@ionic/angular';
 import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
 import { Platform } from "@ionic/angular";
-import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx";
+// import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx";
 import { OpenNativeSettings } from '@ionic-native/open-native-settings/ngx';
 import { AttendScanService } from "../../hmg-common/services/attend-services/attend-scan.service";
 
@@ -42,7 +42,7 @@ export class WifiModalComponent implements OnInit {
     public modalController: ModalController,
     public ts: TranslatorService,
     public ngZone: NgZone,
-    private wifiWizard2: WifiWizard2,
+    // private wifiWizard2: WifiWizard2,
     private openNativeSettings: OpenNativeSettings,
     private platform: Platform,
     public attendScanService: AttendScanService
@@ -58,8 +58,8 @@ export class WifiModalComponent implements OnInit {
 
 
   async getConnectedBSSID(ssid:string){
-    let avaialbleSSID = await this.wifiWizard2.getConnectedBSSID(); 
-    console.log(avaialbleSSID);
+    // let avaialbleSSID = await this.wifiWizard2.getConnectedBSSID(); 
+    // console.log(avaialbleSSID);
   }
 
   async startWifiConnection() {
@@ -67,49 +67,49 @@ export class WifiModalComponent implements OnInit {
     const isIOS = this.platform.is("ios");
 
     if (isAndroid) {
-      let isWifiAvailable = await this.isWifiAvailable(this.ssid);
-      console.debug("isWifiAvailable: " + isWifiAvailable);
-      if(isWifiAvailable){
-        console.debug("Wifi Credientials:    " + this.ssid + " | " + this.password);
-        this.wifiWizard2.connect(this.ssid, true, this.password, this.algo).then(async (value) =>{        
-          let ssid_ = await this.wifiWizard2.getConnectedSSID();
-          if(ssid_ == this.ssid){
-            console.debug("Wifi Connected: Verified Access | " + value + " | " + ssid_);
-            setTimeout(() => {
-              this.swipeAttendanceWifi(ssid_);
-            },2000);
-          }else{
-            this.showErrorInvalidWorkspace();
-          }
-        })
-        .catch((err) => { 
-          console.debug(err);
-          this.showErrorForgetWifiConfiguration();
-        });
-      }else{
-        console.debug("Wifi is not available considered your device is not in range");
-        this.showErrorInvalidWorkspace();
-      }
+      // let isWifiAvailable = await this.isWifiAvailable(this.ssid);
+      // console.debug("isWifiAvailable: " + isWifiAvailable);
+      // if(isWifiAvailable){
+        // console.debug("Wifi Credientials:    " + this.ssid + " | " + this.password);
+        // this.wifiWizard2.connect(this.ssid, true, this.password, this.algo).then(async (value) =>{        
+        //   let ssid_ = await this.wifiWizard2.getConnectedSSID();
+        //   if(ssid_ == this.ssid){
+        //     console.debug("Wifi Connected: Verified Access | " + value + " | " + ssid_);
+        //     setTimeout(() => {
+        //       this.swipeAttendanceWifi(ssid_);
+        //     },2000);
+        //   }else{
+        //     this.showErrorInvalidWorkspace();
+        //   }
+        // })
+        // .catch((err) => { 
+        //   console.debug(err);
+        //   this.showErrorForgetWifiConfiguration();
+        // });
+      // }else{
+      //   console.debug("Wifi is not available considered your device is not in range");
+      //   this.showErrorInvalidWorkspace();
+      // }
     } else if (isIOS) {
-      this.wifiWizard2.iOSConnectNetwork(this.ssid,this.password).then(async (value) => {
-        let ssid_ = await this.wifiWizard2.getConnectedSSID();
-        if(ssid_ == this.ssid){
-          console.debug("Wifi Connected: Verified Access | " + value + " | " + ssid_);
-          setTimeout(() => {
-            this.swipeAttendanceWifi(ssid_);
-          },6000);
-        }else{
-          this.showErrorInvalidWorkspace();
-        }
-      })
-      .catch((err) => { 
-        console.debug(err);
-        this.showErrorInvalidWorkspace();
-      });
-      if(this.wifiWizard2.isWifiEnabled){
-      } else{
-        this.showWifiNotEnabled();
-      }
+      // this.wifiWizard2.iOSConnectNetwork(this.ssid,this.password).then(async (value) => {
+      //   let ssid_ = await this.wifiWizard2.getConnectedSSID();
+      //   if(ssid_ == this.ssid){
+      //     console.debug("Wifi Connected: Verified Access | " + value + " | " + ssid_);
+      //     setTimeout(() => {
+      //       this.swipeAttendanceWifi(ssid_);
+      //     },6000);
+      //   }else{
+      //     this.showErrorInvalidWorkspace();
+      //   }
+      // })
+      // .catch((err) => { 
+      //   console.debug(err);
+      //   this.showErrorInvalidWorkspace();
+      // });
+      // if(this.wifiWizard2.isWifiEnabled){
+      // } else{
+      //   this.showWifiNotEnabled();
+      // }
     }
   }​
 
@@ -142,13 +142,13 @@ export class WifiModalComponent implements OnInit {
   async disconnectWifi() {
     const isAndroid = this.platform.is("android");
     const isIOS = this.platform.is("ios");
-    if(isAndroid){
-      await this.wifiWizard2.disconnect(this.ssid).catch((error)=>{ console.error(error) });
-      await this.wifiWizard2.remove(this.ssid).catch((error)=>{ console.error(error) });
-      console.debug("Wifi Removed");
-    }else if(isIOS){
-      await this.wifiWizard2.iOSDisconnectNetwork(this.ssid);
-    }
+    // if(isAndroid){
+    //   await this.wifiWizard2.disconnect(this.ssid).catch((error)=>{ console.error(error) });
+    //   await this.wifiWizard2.remove(this.ssid).catch((error)=>{ console.error(error) });
+    //   console.debug("Wifi Removed");
+    // }else if(isIOS){
+    //   await this.wifiWizard2.iOSDisconnectNetwork(this.ssid);
+    // }
   }
 
   async swipeAttendanceWifi(code:any) { 
@@ -211,15 +211,15 @@ export class WifiModalComponent implements OnInit {
   }
 
   async isWifiAvailable(ssid:string){
-    let avaialble_wifi = await this.wifiWizard2.scan(); 
-    let find = avaialble_wifi.find(element => {
-      return element.SSID == ssid;
-    });
+    // let avaialble_wifi = await this.wifiWizard2.scan(); 
+    // let find = avaialble_wifi.find(element => {
+    //   return element.SSID == ssid;
+    // });
     
-    if (find === undefined) {
-      return false;
-    } else {
-      return find.SSID == ssid;
-    }
+    // if (find === undefined) {
+    //   return false;
+    // } else {
+    //   return find.SSID == ssid;
+    // }
   }
 }
diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html
index 27183d32..29d4537b 100644
--- a/Mohem/src/app/my-team/details/details.component.html
+++ b/Mohem/src/app/my-team/details/details.component.html
@@ -36,7 +36,7 @@
             <ion-row style="margin-top: 11px;">
               <ion-col [size]="6">
                 <p class="subTitle">{{ts.trPK('userProfile','role')}}</p>
-                  <span class="Boldtext">{{jobName}}</span>
+                  <span class="Boldtext">{{employee.POSITION_NAME}}</span>
               </ion-col>
               <ion-col [size]="6" style="border-left: 1px solid rgb(221 221 221);">
                 <p class="subTitle" style="line-height: 12px !important;">{{ts.trPK('userProfile','empNo')}}</p>
@@ -61,7 +61,7 @@
           </ion-segment-button>
         </ion-col>
       <ion-col>
-          <span class="btnTitle">{{ts.trPK('myTeam','profile-details')}}</span>
+          <span  [ngClass]="direction == 'en' ? 'btnTitle' : 'btnTitle_ar'">{{ts.trPK('myTeam','profile-details')}}</span>
         </ion-col>
          </ion-col>
       <ion-col [size]="4" (click)="getMenuEntries(employee)">
@@ -72,7 +72,7 @@
             <img class="imgSize" src="../assets/imgs/create-req.svg">
       </ion-segment-button>
         </ion-col>
-      <ion-col > <span class="btnTitle">{{ts.trPK('vacation-rule','create-request')}}</span></ion-col>
+      <ion-col > <span  [ngClass]="direction == 'en' ? 'btnTitle' : 'btnTitle_ar'">{{ts.trPK('vacation-rule','create-request')}}</span></ion-col>
       </ion-col>
       <!-- <ion-col [size]="3">
         <ion-col>
@@ -93,7 +93,7 @@
                 <img class="imgSize" src="../assets/imgs/team-members.svg">
             </ion-segment-button>
           </ion-col>
-        <ion-col><span class="btnTitle">{{ts.trPK('myTeam','team-members')}}</span></ion-col>
+        <ion-col><span  [ngClass]="direction == 'en' ? 'btnTitle' : 'btnTitle_ar'">{{ts.trPK('myTeam','team-members')}}</span></ion-col>
           </ion-col>
         </ion-segment>
         
@@ -502,7 +502,7 @@
         </ion-col>
         <ion-col [size]="12">
           <h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','job')}}</h2>
-          <p [ngClass]="direction == 'en' ? 'label2':'label2-ar' ">{{jobName}}</p>
+          <p [ngClass]="direction == 'en' ? 'label2':'label2-ar' ">{{employee.POSITION_NAME}}</p>
         </ion-col>
         <ion-col [size]="12">
           <h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','payrol')}}</h2>
@@ -514,7 +514,7 @@
         </ion-col> -->
         <ion-col [size]="12">
           <h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','position')}}</h2> 
-          <p [ngClass]="direction == 'en' ? 'label2':'label2-ar' ">{{jobName}}</p>
+          <p [ngClass]="direction == 'en' ? 'label2':'label2-ar' ">{{employee.POSITION_NAME}}</p>
         </ion-col>
         <ion-col [size]="12" style="border-bottom: none;">
           <h2 [ngClass]="direction == 'en' ? 'label1':'label1-ar' ">{{ts.trPK('userProfile','grade')}}</h2>
diff --git a/Mohem/src/app/my-team/details/details.component.scss b/Mohem/src/app/my-team/details/details.component.scss
index 1e61c866..f590c7c0 100644
--- a/Mohem/src/app/my-team/details/details.component.scss
+++ b/Mohem/src/app/my-team/details/details.component.scss
@@ -195,7 +195,8 @@ $actionBtnSize : 36px;
         border-radius: 50% !important;
         // margin-right: 22px;
         // margin-left: 22px;
-        margin-left: 19px;
+        margin-left: 30px;
+        margin-right: 30px;
         background-color: #BE332F;
         display: flex;
     }
@@ -234,10 +235,10 @@ $actionBtnSize : 36px;
         border-radius: 50% !important;
         // margin-right: 22px;
         // margin-left: 22px;
-        margin-left: 15px;
+        margin-left: 30px;
         background: #414040 !important;
         display: flex;
-
+        margin-right: 30px;
     }
 }
 
@@ -825,14 +826,17 @@ $actionBtnSize : 36px;
 }
 
 
+
+
 .Boldtext {
     // font-size: 13px;
     // font-family: WorkSans-Bold;
     // color: black !important;
     // display: block !important;
     text-align: center;
-    letter-spacing: -0.64px;
-    color: #2B353E;
+    letter-spacing: -0.52px;
+    color: #5C6F79;
+    font-weight: bold;
     opacity: 1;
     font-family: var(--fontFamilyPoppins-SemiBold, inherit);
     font-size: 16px;
@@ -938,16 +942,17 @@ $actionBtnSize : 36px;
 .name {
     text-align: center;
     letter-spacing: -0.84px;
-    color: #2B353E;
+    color: #004D71;
+    font-weight: bold;
     opacity: 1;
-    font-family: var(--fontFamilyPoppins-SemiBold, inherit);
+    font-family: 'Inter' !important;
     line-height: 21px;
     font-size: 21px;
 }
 
 .email {
     text-align: center;
-    font-family: var(--fontFamilyPoppins-SemiBold, inherit);
+    font-family: 'Inter' !important;
     font-size: 13px;
     line-height: 6px;
     letter-spacing: -0.52px;
@@ -958,8 +963,9 @@ $actionBtnSize : 36px;
 
 .subTitle {
     text-align: center;
-    letter-spacing: -0.52px;
-    color: #A2A2A2;
+    letter-spacing: -0.56px;
+    color: #004D71;
+    font-weight: bold;
     opacity: 1;
     font-family: var(--fontFamilyPoppins-SemiBold, inherit);
     font-size: 13px;
@@ -972,7 +978,8 @@ $actionBtnSize : 36px;
     line-height: 20px;
     font-size: 20px;
     letter-spacing: -0.8px;
-    color: #2B353E;
+    color: #004D71;
+    font-weight: bold;
     opacity: 1;
     margin-top: 20px;
     margin-bottom: 2px;
@@ -982,9 +989,10 @@ $actionBtnSize : 36px;
     text-align: left;
     font-family: var(--fontFamilyPoppins-SemiBold, inherit);
     line-height: 0px;
-    font-size: 13px;
-    letter-spacing: -0.52px;
-    color: #A2A2A2;
+    font-size: 14px;
+    letter-spacing: -0.56px;
+    color: #5C6F79;
+    font-weight: bold;
     opacity: 1;
 }
 
@@ -994,7 +1002,8 @@ $actionBtnSize : 36px;
     line-height: 5px;
     font-size: 16px;
     letter-spacing: -0.64px;
-    color: #2B353E;
+    color: #004D71;
+    font-weight: bold;
     opacity: 1;
 }
 
@@ -1004,30 +1013,37 @@ $actionBtnSize : 36px;
     line-height: 20px;
     font-size: 20px;
     letter-spacing: -0.8px;
-    color: #2B353E;
+    color: #004D71;
+    font-weight: bold;
     opacity: 1;
     margin-top: 20px;
     margin-bottom: 2px;
+    padding: 5px;
+    font-weight: bold;
 }
 
 .label1-ar {
     text-align: right;
     font-family: var(--fontFamilyPoppins-SemiBold, inherit);
     line-height: 0px;
-    font-size: 13px;
-    letter-spacing: -0.52px;
-    color: #A2A2A2;
+    font-size: 18px;
+    letter-spacing: -0.56px;
+    color: #5C6F79;
+    font-weight: bold;
     opacity: 1;
+    padding: 1px 5px 1px 5px;
 }
 
 .label2-ar {
     text-align: right;
     font-family: var(--fontFamilyPoppins-SemiBold, inherit);
     line-height: 5px;
-    font-size: 16px;
+    font-size: 18px;
     letter-spacing: -0.64px;
-    color: #2B353E;
+    color: #004D71;
+    font-weight: bold;
     opacity: 1;
+    padding: 1px 5px 1px 5px;
 }
 
 @media screen and (min-width: 768px) and (max-width:1024px) {
diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts
index 1ce8c501..d73df5f8 100644
--- a/Mohem/src/app/my-team/details/details.component.ts
+++ b/Mohem/src/app/my-team/details/details.component.ts
@@ -245,10 +245,10 @@ export class DetailsComponent implements OnInit {
     this.employee = this.common.sharedService.getSharedData(MyTeamService.EMPLOYEE_SHARED_DATA, false);
     console.log(this.employee);
 
-    let jobTitle = this.employee.POSITION_NAME.split('.');
-    if (jobTitle && jobTitle.length > 1) {
-      this.jobName = jobTitle[0] + " " + jobTitle[1];
-    }
+    let jobTitle = this.employee.POSITION_NAME;
+    // if (jobTitle && jobTitle.length > 1) {
+      this.jobName = jobTitle;
+    // }
 
     const request = {
       P_SELECTED_EMPLOYEE_NUMBER: this.employee.EMPLOYEE_NUMBER
diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html
index 0cbb0cef..2d769461 100644
--- a/Mohem/src/app/my-team/home/home.component.html
+++ b/Mohem/src/app/my-team/home/home.component.html
@@ -1,6 +1,5 @@
 <app-generic-header
   showBack="true"
-  subordinateLeave='true'
   backLink="/home"
   [headerText]="'myTeam, myTeam-header' | translate">
 </app-generic-header>
@@ -40,11 +39,11 @@
        <ion-row>
        <ion-col  >
          <div (ionChange)="searchEmployee($event)" class="search-label">
-        <ion-input *ngIf="showEmailInput" placeholder="Search by Email" [(ngModel)]="searchEmail"  pattern="email"  ></ion-input>
-        <ion-input *ngIf="showUserNameOrNameInput" placeholder ="Search by Name" [(ngModel)]="searchNameOrUserName"  ></ion-input>
-        <ion-input *ngIf="showUserNameInput" placeholder ="Search by Username" [(ngModel)]="searchUserName" ></ion-input>
+        <ion-input *ngIf="showEmailInput" [placeholder]="'myTeam, search-email' | translate" [(ngModel)]="searchEmail"  pattern="email"  ></ion-input>
+        <ion-input *ngIf="showUserNameOrNameInput" [placeholder]="'myTeam, search-name' | translate" [(ngModel)]="searchNameOrUserName"  ></ion-input>
+        <ion-input *ngIf="showUserNameInput" [placeholder]="'myTeam, search-username' | translate" [(ngModel)]="searchUserName" ></ion-input>
          </div>
-         <div *ngIf="isSearch" (click)="clearSearch()" class="search-container">
+         <div *ngIf="isSearch" (click)="clearSearch()" [class]="direction =='en' ? 'search-container' : 'search-container-ar'">
             <ion-col style="float: right;"  >
                 <ion-icon name="close" ></ion-icon>
             </ion-col>
@@ -52,85 +51,13 @@
       </ion-col>
     </ion-row>
       </div>
-      <!-- <div class="result-text-container">
-          <h2>{{totalEmployees}}</h2>
-          <span>{{ts.trPK('myTeam','total')}} <br> {{ts.trPK('myTeam','team-members')}}</span>
-         
-      </div> --> 
+     
   </div>
   <div class="div">
     <div class="text" >{{ts.trPK('myTeam','my-team-members')}}</div>
     <div [ngClass]="direction == 'en' ? 'numberEmp':'numberEmp-ar' ">{{EmployeeTotal}}</div>
   </div>
-  <!-- <div>
-    <ion-row>
-    <ion-col><p class="text">{{ts.trPK('myTeam','my-team-members')}}</p></ion-col>
-    <ion-col> <div [ngClass]="direction == 'en' ? 'number':'number-ar' ">
-      <p class="numberEmp">{{EmployeeTotal}}</p></div></ion-col>
-  </ion-row>
-    
-  </div> -->
-
-
-
-  <!-- <div class="result-graph">
-      <div class="request-heading">
-        <span>{{ts.trPK('myTeam','team-stats')}}</span>
-      </div>
-      <div class="result-text-container">
-          <h2>{{totalEmployees}}</h2>
-          <span>{{ts.trPK('myTeam','total')}} <br> {{ts.trPK('myTeam','team-members')}}</span>
-         
-      </div>
-      <p-chart class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
-  </div> -->
-
-    <!-- <ion-row class="filters-row">
-      <ion-slides [options]="slideOptsOne">
-          <ion-slide *ngFor="let filter of filters;  let i=index">
-              <app-card-filter
-                [value]="filter.value"
-                [text]="filter.name"
-                [color]="filter.color"
-                [active]="filter.active"
-                (click)="activeFilter(i)"
-              ></app-card-filter>
-          </ion-slide>
-      </ion-slides>
-    </ion-row> -->
-
-    <!-- <div style="margin-top: 15px;background: white;border-radius: 100px;overflow: hidden;">
-      <ion-row no-padding>
-        <ion-col [size]="3" class="search-dropdown" no-padding>
-            <ion-select okText="{{ts.trPK('general','ok')}}" cancelText="{{ts.trPK('general','cancel')}}"
-            [(ngModel)]="searchKeySelect" (ionChange)="showSelectedField($event)">
-              <ion-select-option value="Name" selected="true">{{ts.trPK('searchForReplacment','name')}}</ion-select-option>
-              <ion-select-option value="User Name">{{ts.trPK('searchForReplacment','userName')}} </ion-select-option>
-              <ion-select-option value="Email">{{ts.trPK('searchForReplacment','email')}} </ion-select-option>
-          </ion-select>
-        </ion-col>
-        <ion-col [size]="7" class="input-container" no-padding>
-          <ion-input *ngIf="showEmailInput" placeholder="Employee Email" [(ngModel)]="searchEmail"  pattern="email"></ion-input>
-          <ion-input *ngIf="showUserNameOrNameInput" placeholder ="{{ts.trPK('general','search')}}" [(ngModel)]="searchNameOrUserName"></ion-input>
-        </ion-col> 
-        
-      
-        
-         <ion-col [size]="2" style="background: #ccc;text-align: center;" no-padding (click)="searchEmployee()">
-          <ion-icon style="margin-top: 10px;font-size: 20px;" class="search-icons" color="light" name="search"></ion-icon>
-        </ion-col>
-      </ion-row>  
-    </div> -->
-
-    <!-- <div *ngIf="isSearch">
-      <ion-row class="search-container">
-        <ion-col style="float: left;" size=[6] (click)="clearSearch()">
-            <span style="margin-left: 5px;">{{ts.trPK('work-list','clear-search')}}</span>
-            <ion-icon name="close" ></ion-icon>
-        </ion-col>
-      </ion-row>
-    </div> -->
-    
+  
     <ng-container *ngFor="let subordinate of empSubordinate;let i=index">
         <app-employee-information
           [name]="subordinate.EMPLOYEE_NAME"
diff --git a/Mohem/src/app/my-team/home/home.component.scss b/Mohem/src/app/my-team/home/home.component.scss
index 95ed4c36..fa2563ad 100644
--- a/Mohem/src/app/my-team/home/home.component.scss
+++ b/Mohem/src/app/my-team/home/home.component.scss
@@ -36,20 +36,14 @@ ion-content {
 }
 
 .request-heading {
-    padding-left: 15px;
+    padding-left: 20px;
     margin-top: 10px;
 
     span {
-        // display: block;
-        // padding-top: 8px;
-        // padding-left: 15px;
-        // font-weight: bold;
-        // font-size: 12px;
-        // margin-top: 9px;
+
         text-align: left;
-        font-family: var(--fontFamilyPoppins-SemiBold, inherit);
         line-height: 18px;
-        font-size: 12px;
+        font-weight: bold;
         letter-spacing: -0.48px;
         color: #2B353E;
         opacity: 1;
@@ -57,13 +51,6 @@ ion-content {
 }
 
 .search-label {
-    // border: 1px solid #ccc;
-    // margin-left: 15px;
-    // margin-right: 15px;
-    // border-radius: 22px;
-    // margin-top: 24px;
-    // font-size: 11px;
-    // color: rgb(143, 141, 141);
     border: 1px solid #ccc;
     margin-left: 15px;
     margin-right: 15px;
@@ -73,6 +60,7 @@ ion-content {
     color: #8f8d8d;
     margin-right: 15px !important;
     padding: 10px;
+    font-family: 'Inter' !important;
 }
 
 .result-graph {
@@ -201,6 +189,7 @@ ion-content {
     // margin-top: 15px;
     // margin-top: -35px;
     // margin-left: 262px;
+
     width: 30px;
     height: 30px;
     position: absolute;
@@ -209,9 +198,6 @@ ion-content {
     z-index: 999999;
 
     ion-col {
-        // background: white;
-        // border-radius: 12px;
-        // padding-right: 10px;
         flex: none;
 
         ion-icon {
@@ -228,12 +214,32 @@ ion-content {
     }
 }
 
-// .myClass .toggle-icon {
-// 	background-color: purple; // this changes the background, ie the grey stripe.
-// 	.toggle-inner {
-// 		background-color: yellow; // this changes the backgroundcolor of the toggle dot.
-// 	}
-// }
+.search-container-ar {
+
+    width: 30px;
+    height: 30px;
+    position: absolute;
+    top: 45px;
+    left: 38px;
+    z-index: 999999;
+
+    ion-col {
+        flex: none;
+
+        ion-icon {
+            margin-right: 3px;
+            font-size: 14px;
+            margin-left: 3px;
+            vertical-align: middle;
+        }
+
+        span {
+            font-size: 12px;
+            vertical-align: middle;
+        }
+    }
+}
+
 
 @media only screen and (max-width: 375px) {
     .text-label {
@@ -249,34 +255,21 @@ ion-content {
 
 
 .text-label {
-    // --color: black !important;
-    // font-size: 13px;
-    // margin-left: 15px;
-    // margin-right: 18px;
     text-align: left;
-    // font: normal normal 600 12px/18px Poppins;
-    font-family: var(--fontFamilyPoppins-SemiBold, inherit);
     line-height: 18px;
     font-size: 12px;
     letter-spacing: -0.48px;
     color: #575757 !important;
     opacity: 1;
-    margin-left: 15px;
-    margin-right: 18px;
+    margin-left: 5px;
+    margin-right: 5px;
+    font-weight: bold;
 }
 
 .radio-list {
     background: white;
-    // margin-left: 18px;
-    /* margin-right: 10px; */
-    // margin-top: 12px;
 }
 
-// .selected .radio-icon {
-//     border-color: #0064D9;
-//     color: red;
-//    }
-
 .radio-icon {
 
     .custom-radio .radio-icon {
@@ -291,12 +284,7 @@ ion-content {
 }
 
 .text {
-    // font-size: 16px;
-    // font-weight: bolder;
-    // font-family: 'WorkSans-Bold';
-    // margin-top: 27px;
     text-align: left;
-    font-family: var(--fontFamilyPoppins-SemiBold, inherit);
     line-height: 11px;
     font-size: 20px;
     letter-spacing: -0.8px;
@@ -304,26 +292,10 @@ ion-content {
     opacity: 1;
     margin-top: 30px;
     margin-bottom: 28px;
+    font-weight: bold;
 }
 
 
-// .number{
-//     width: 21px;
-//     height: 21px;
-//     padding-right: -10px;
-//     border-radius: 100%;
-//     background-color: #BE332F;
-//     z-index: 9;
-//     margin-top: 26px;
-// }
-
-// .numberEmp{
-//     color: white;
-//     font-size: 12px;
-//     font-weight: bolder;
-//     margin-left: 3px;
-//     padding-top: 2px;
-// }
 .number {
     width: 22px;
     height: 20px;
@@ -351,33 +323,52 @@ ion-content {
     /* padding-top: 5px; */
     /* padding-right: 20px; */
     margin-left: 13px;
-    width: 23px;
-    height: 23px;
+    width: 25px;
+    height: 25px;
+    border-radius: 100%;
+    color: white;
+    font-size: 12px;
+    font-weight: bolder;
+    margin-left: 13px;
+    width: 25px;
+    height: 25px;
     border-radius: 100%;
     background-color: #BE332F;
     z-index: 9;
     margin-top: 25px;
+    text-align: center;
+    padding-top: 5px;
+    z-index: 9;
+    margin-top: 25px;
     /* padding-left: 4px; */
     text-align: center;
-    padding-top: 3px;
+    padding-top: 5px;
 }
 
 .numberEmp-ar {
     color: white;
-    font-size: 12px;
+    font-size: 11px;
     font-weight: bolder;
-    /* padding-top: 5px; */
-    /* padding-right: 20px; */
     margin-right: 13px;
-    width: 23px;
-    height: 23px;
+    width: 25px;
+    height: 25px;
+    border-radius: 100%;
+    color: white;
+    font-size: 12px;
+    font-weight: bolder;
+    margin-left: 13px;
+    width: 25px;
+    height: 25px;
     border-radius: 100%;
     background-color: #BE332F;
     z-index: 9;
     margin-top: 25px;
-    /* padding-left: 4px; */
     text-align: center;
-    padding-top: 3px;
+    padding-top: 5px;
+    z-index: 9;
+    margin-top: 25px;
+    text-align: center;
+    padding-top: 5px;
 }
 
 .div {
diff --git a/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.html b/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.html
index 8adf1dde..7a6cd979 100644
--- a/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.html
+++ b/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.html
@@ -14,7 +14,7 @@
     <ion-grid>
       <ion-row>
         <ion-col size='6'>
-          <ion-label position='floating' style="margin-left: 15px;" class="colBold">{{ts.trPK('general','from')}} </ion-label>
+          <ion-label position='floating' style="margin: 15px;" class="colBold">{{ts.trPK('general','from')}} </ion-label>
           
           <ion-item class='dynamicField' lines='none'>
             <ion-datetime style="padding: 0px" [(ngModel)]="startDate"  min="1900" max="2100" displayFormat="MMM/DD/YYYY"  placeholder="MM/DD/YYYY" required
@@ -24,7 +24,7 @@
           </ion-item>
         </ion-col>
         <ion-col size='6'>
-          <ion-label position='floating' style="margin-left: 15px;" class="colBold">{{ts.trPK('general','to')}} </ion-label>
+          <ion-label position='floating' style="margin: 15px;" class="colBold">{{ts.trPK('general','to')}} </ion-label>
           <ion-item class='dynamicField' lines='none'>
             <ion-datetime style="padding: 0px" [(ngModel)]="endDate"  min="1900" max="2100" displayFormat="MMM/DD/YYYY"  placeholder="MM/DD/YYYY" required
             cancelText="{{ts.trPK('general','cancel')}}"
diff --git a/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.scss b/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.scss
index f816da10..fcacd2b8 100644
--- a/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.scss
+++ b/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.scss
@@ -156,31 +156,31 @@
         color: #2B353E;
         opacity: 1;
     }
-
-    .title {
-        //     font-size: 13px;
-        //     color: #888;
-        //     width: 100%;
-        //     text-overflow: ellipsis;
-        //     white-space: nowrap;
-        //     overflow: hidden;
-        //     display: block;
-        //     margin-left: -10px;
-        // margin-top: -6px;
-        // color: black;
-        font-family: var(--fontFamilyPoppins-SemiBold, inherit);
-        line-height: 12px;
-        letter-spacing: -0.56px;
-        color: #575757;
-        opacity: 1;
-        font-size: 14px;
-        width: 100%;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
-        display: block;
-        margin-left: -10px;
-        margin-top: -10px;
+    
+    .title{
+    //     font-size: 13px;
+    //     color: #888;
+    //     width: 100%;
+    //     text-overflow: ellipsis;
+    //     white-space: nowrap;
+    //     overflow: hidden;
+    //     display: block;
+    //     margin-left: -10px;
+    // margin-top: -6px;
+    // color: black;
+    font-family: var(--fontFamilyPoppins-SemiBold, inherit);
+    line-height: 12px;
+    letter-spacing: -0.56px;
+    color: #575757;
+    opacity: 1;
+    font-size: 14px;
+    width: 100%;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    // overflow: hidden;
+    display: block;
+    margin-left: -10px;
+    margin-top: -10px;
     }
 }
 
diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html
index 6ff0d57d..ce97cb38 100644
--- a/Mohem/src/app/notification/home/home.component.html
+++ b/Mohem/src/app/notification/home/home.component.html
@@ -60,7 +60,7 @@
       </ion-col>
     </ion-row>
 
-    <div style="position: relative;">
+    <div [ngClass]="direction === 'ar' ? 'worklist-content-ar' : 'worklist-content'">
       <div [ngClass]="showFormattedData.length > 0 && direction == 'en'? 'work-list-container' : 'work-list-container-ar'" *ngIf='selectedFilter != "ITG" && showFormattedData.length > 0'>
         <div *ngFor="let formattedData of showFormattedData;  let i = index">
           <span [ngClass]="direction == 'en'? 'date-span':'date-span-ar'">{{formattedData.date}}</span>
diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss
index 16f15270..14d2b399 100644
--- a/Mohem/src/app/notification/home/home.component.scss
+++ b/Mohem/src/app/notification/home/home.component.scss
@@ -32,8 +32,7 @@
     height: 99%;
     background: #e4e4e4;
     z-index: 1;
-    /* margin-left: -10px; */
-    /* z-index: 1; */
+
 }
 
 .timelineMain .timelineMain-thumb {
@@ -42,12 +41,6 @@
     width: 50px;
     z-index: 2;
     position: absolute;
-    // :root[dir="ltr"]{
-    //    left: 37px;
-    // }
-    // :root[dir="rtl"]{
-    //     right: 37px;
-    // }
     width: 50px;
     float: right;
     top: 0px;
@@ -55,9 +48,6 @@
 
 .timelineMain .timelineMain-thumb.timelineMain-icon {
     height: 50px;
-    //   text-align: center;
-    //   color: white;
-    //   border: 5px solid #CBD0D3;
     transform: scale(0.3);
 }
 
@@ -339,12 +329,21 @@ ion-content {
 }
 
 .filters-row {
-    margin-top: 10px;
+    margin-top: 20px;
     margin-left: 20px;
 }
 
 .filters-row-ar {
-    margin-top: 15px;
+    margin-top: 20px;
+    margin-right: 20px;
+}
+
+.worklist-content {
+    position: relative;
+}
+
+.worklist-content-ar {
+    position: relative;
     margin-right: 20px;
 }
 
@@ -401,6 +400,8 @@ ion-content {
         // padding-right: 30px;
         flex: none;
 
+        box-shadow: 0px 0px 3px #cdcdcd;
+
         ion-icon {
             margin-right: 3px;
             font-size: 20px;
@@ -463,6 +464,7 @@ ion-content {
     margin-right: 20px;
     margin-bottom: 15px;
     padding-right: 15px;
+    box-shadow: 0px 0px 3px #cdcdcd;
 
     p {
         font-size: 14px;
@@ -524,8 +526,8 @@ ion-content {
 
 .float-r {
     float: right;
-}
-
+  }
+  
 .float-l {
     float: left;
 }
\ No newline at end of file
diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts
index b39655b7..5fe957f5 100644
--- a/Mohem/src/app/notification/home/home.component.ts
+++ b/Mohem/src/app/notification/home/home.component.ts
@@ -207,7 +207,9 @@ export class HomeComponent implements OnInit {
     this.data = values.data;
     this.filters = values.filters;
 
-    const loadWorkList = this.common.sharedService.getSharedData('loadWorkList', false);
+    // const loadWorkList = this.common.sharedService.getSharedData('loadWorkList', false);
+    const loadWorkList = true;
+
     if (loadWorkList) {
       this.receivedITGCount = false;
       this.showChart = false;
@@ -227,7 +229,9 @@ export class HomeComponent implements OnInit {
       this.direction = TranslatorService.getCurrentLanguageName();
       this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false);
 
-      var isWorklistChanged = this.common.sharedService.getSharedData(HomeComponent.COUNT_CHANGED);
+      // var isWorklistChanged = this.common.sharedService.getSharedData(HomeComponent.COUNT_CHANGED);
+      var isWorklistChanged = true;
+
       if (isWorklistChanged) {
         this.openNotificationsDashboard()
       }
diff --git a/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts b/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts
index cd32d6ec..d644d815 100644
--- a/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts
+++ b/Mohem/src/app/notification/models/WorklistsubmitterInfoReq.ts
@@ -5,10 +5,10 @@ export class WorkListSubmitterInfoRequest extends Request{
 public P_NOTIFICATION_TYPE: string;//string
 public P_SELECTED_EMPLOYEE_NUMBER: string;//String
 public P_SELECTED_RESP_ID: Number;//NUMBER
-public P_PAGE_NUM : Number;
-public P_PAGE_LIMIT : Number;
-public P_SEARCH_USER_NAME:String;
-public P_SEARCH_EMPLOYEE_DISPLAY_NAME:String;
-public P_SEARCH_EMAIL_ADDRESS:String;
+// public P_PAGE_NUM : Number;
+// public P_PAGE_LIMIT : Number;
+// public P_SEARCH_USER_NAME:String;
+// public P_SEARCH_EMPLOYEE_DISPLAY_NAME:String;
+// public P_SEARCH_EMAIL_ADDRESS:String;
 
 }
\ No newline at end of file
diff --git a/Mohem/src/app/notification/service/work-list.main.service.ts b/Mohem/src/app/notification/service/work-list.main.service.ts
index 8c53b0bf..5c17a101 100644
--- a/Mohem/src/app/notification/service/work-list.main.service.ts
+++ b/Mohem/src/app/notification/service/work-list.main.service.ts
@@ -43,7 +43,8 @@ export class WorklistMainService {
   public static getPOItemHistory = "Services/ERP.svc/REST/GET_PO_ITEM_HISTORY";
   public static getMOItemHistory = "Services/ERP.svc/REST/GET_MO_ITEM_HISTORY";
   public static getNotificationButtons = "Services/ERP.svc/REST/GET_NOTIFICATION_BUTTONS";
-  public static getUserInfo = "Services/ERP.svc/REST/Get_UserInformation";
+  // public static getUserInfo = "Services/ERP.svc/REST/Get_UserInformation";
+  public static getUserInfo = "Services/ERP.svc/REST/Get_Notification_UserInformation";
   public static getNotificationAction = "Services/ERP.svc/REST/NOTIFICATION_ACTIONS";
   public static getNotificationRespondAtt = "Services/ERP.svc/REST/NOTIFICATION_GET_RESPOND_ATTRIBUTES";
   public static getQutationAnalysisUrl = "Services/ERP.svc/REST/GET_QUOTATION_ANALYSIS";
diff --git a/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss b/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss
index 4560ae98..211351ee 100644
--- a/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss
+++ b/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss
@@ -1,3 +1,3 @@
 .header-toolbar-new {
   --background: #BE332F;
-}
\ No newline at end of file
+}
diff --git a/Mohem/src/app/notification/work-list-details/work-list-details.component.ts b/Mohem/src/app/notification/work-list-details/work-list-details.component.ts
index 2635ee81..6a07340c 100644
--- a/Mohem/src/app/notification/work-list-details/work-list-details.component.ts
+++ b/Mohem/src/app/notification/work-list-details/work-list-details.component.ts
@@ -32,13 +32,15 @@ export class WorkListDetailsComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.WorkListSubmitterInfoObj.P_PAGE_LIMIT = 100;
-    this.WorkListSubmitterInfoObj.P_PAGE_NUM = 1;
+    // this.WorkListSubmitterInfoObj.P_PAGE_LIMIT = 100;
+    // this.WorkListSubmitterInfoObj.P_PAGE_NUM = 1;
     this.WorkListSubmitterInfoObj.P_SELECTED_EMPLOYEE_NUMBER = this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER;
     this.WorkListSubmitterInfoObj.P_SELECTED_RESP_ID = -999;
-    this.WorkListSubmitterInfoObj.P_SEARCH_EMAIL_ADDRESS = "";
-    this.WorkListSubmitterInfoObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME = "";
-    this.WorkListSubmitterInfoObj.P_SEARCH_USER_NAME = "";
+    this.WorkListSubmitterInfoObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID;
+
+    // this.WorkListSubmitterInfoObj.P_SEARCH_EMAIL_ADDRESS = "";
+    // this.WorkListSubmitterInfoObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME = "";
+    // this.WorkListSubmitterInfoObj.P_SEARCH_USER_NAME = "";
 
     this.getsubmitterInfo(this.WorkListSubmitterInfoObj);
     this.handleNotificationBody();
diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html
index d856fe4d..c8e3ad4c 100644
--- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html
+++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html
@@ -76,10 +76,10 @@
       </div>
       <br/>
   <div class="centerDiv">
-      <ion-button class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px;    --background: transparent; " ion-button (click)="submitAction()">
+      <ion-button class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px;    --background: transparent; --border-radius: 10px; " ion-button (click)="submitAction()">
         {{'general, submit' | translate}}</ion-button>
   
-        <ion-button class="footer-button" style="background: var(--darkblue)!important;border-radius: 10px;    --background: transparent; " ion-button (click)="closeModal()">
+        <ion-button class="footer-button" style="background: var(--darkblue)!important;border-radius: 10px;    --background: transparent; --border-radius: 10px; " ion-button (click)="closeModal()">
         {{'general, cancel' | translate}}</ion-button>
     </div>
 </ion-footer>
\ No newline at end of file
diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts
index b18b1bba..15fe102f 100644
--- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts
+++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts
@@ -125,11 +125,14 @@ export class WorkListRfcComponent implements OnInit {
     if (this.cs.validResponse(result)) {
       if (result.MessageStatus == 1) {
         this.cs.sharedService.setSharedData(true, 'loadWorkList');
+        let itemType = this.getPassNotificationDetails.ITEM_TYPE;
+        if (this.cs.filterKeys[itemType] != 0) {
+         this.cs.filterKeys[itemType] = (this.cs.filterKeys[itemType] - 1)
+        }
 
+        // this.messageSuccess = true;
 
-        this.messageSuccess = true;
-
-        setTimeout(() => {
+        // setTimeout(() => {
           this.messageSuccess = false;
           //this.cs.openNotificationPage();
           // this.modalCtrl.dismiss();
@@ -138,7 +141,7 @@ export class WorkListRfcComponent implements OnInit {
             data: "Success"
           });
 
-        }, 5000);
+        // }, 1000);
         this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED);
         this.cs.openNotificationPage();
 
diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html
index 5a840c1d..d52889c3 100644
--- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html
+++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html
@@ -1,8 +1,8 @@
 <ion-content>
-        <div class="search-header" (click)="dismissModal()">
-  <h2>{{ts.trPK('general','advanced-search')}}</h2>
-  <ion-icon [ngClass]=" direction === 'en' ?  '' : 'cancel-ar'"  slot="icon-only" name="md-close"></ion-icon>
-</div>
+  <div class="search-header" [ngClass]=" direction === 'en' ?  'position-en' : 'position-ar'" (click)="dismissModal()">
+    <h2>{{ts.trPK('general','advanced-search')}}</h2>
+    <ion-icon [ngClass]=" direction === 'en' ?  '' : 'cancel-ar'"  slot="icon-only" name="md-close"></ion-icon>
+  </div>
 
 
   <div class="search-container">
@@ -49,7 +49,7 @@
         <ion-label>{{ts.trPK('vacation-rule','itemType')}}</ion-label>
         <ion-select okText="{{ts.trPK('general','ok')}}" cancelText="{{ts.trPK('general','cancel')}}"
           [(ngModel)]="itemType">
-          <ion-select-option value="HRSSA">HR</ion-select-option>
+          <ion-select-option value="HRSSA">{{text}}</ion-select-option>
           <!-- <ion-select-option value="POAPPRV">PO</ion-select-option>
           <ion-select-option value="REQAPPRV">PR</ion-select-option>
           <ion-select-option value="INVMOA">MR</ion-select-option>
diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss
index d9bed1d7..4eb76587 100644
--- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss
+++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss
@@ -1,26 +1,42 @@
-.search-header{
+.search-header {
     display: inline-block;
+
     h2 {
         display: inline-block;
         margin-left: 20px;
         font-family: WorkSans-Regular;
         font-size: 18px;
         margin-top: 12px;
+        margin-right: 20px;
     }
+
     ion-icon {
         display: inline-block;
         font-size: 23px;
         position: absolute;
+        top: 10px;
+    }
+}
+
+.position-en{
+    ion-icon {
         right: 15px;
-        top: 8px;
     }
 }
+
+.position-ar {
+    ion-icon {
+        left: 15px !important;
+    }
+}
+
 .search-container {
     margin-right: 15px;
     margin-left: 15px;
     // padding-bottom: 100px;
     margin-top: 5px;
-    ion-item{
+
+    ion-item {
         border: 2px solid #eaeaea;
         border-radius: 25px;
         margin-bottom: 20px;
@@ -40,13 +56,16 @@
     --box-shadow: none;
     margin-top: 20px;
     line-height: 50px;
-    span{
+
+    span {
         color: white;
     }
 }
-.custom-width{
+
+.custom-width {
     max-width: 100% !important;
 }
-.enable-overflow{
+
+.enable-overflow {
     overflow: visible !important;
 }
\ No newline at end of file
diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts
index 319c5c60..3b822625 100644
--- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts
+++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts
@@ -17,6 +17,7 @@ export class WorklistAdvancedSearchComponent implements OnInit {
   public notificationType = '';
   public itemType;
   public direction: string;
+  public text = 'HR';
 
   constructor(
     public modalController: ModalController,
@@ -25,7 +26,9 @@ export class WorklistAdvancedSearchComponent implements OnInit {
     this.direction = TranslatorService.getCurrentLanguageName();
    }
 
-  ngOnInit() {}
+  ngOnInit() {
+    this.text = this.direction == 'en' ? 'HR': 'الموارد البشرية';
+  }
 
   public dismissModal() {
     this.modalController.dismiss();
diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss
index 8b51a695..ee57137b 100644
--- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss
+++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss
@@ -53,4 +53,4 @@
   height: 20px;
   display: inline-block;
   margin: 15px 10px 0px 0px;
-}
\ No newline at end of file
+}
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.html b/Mohem/src/app/notification/worklist-main/worklist-main.component.html
index ea114d28..eadb10a3 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html
@@ -451,7 +451,7 @@
                                 <ion-card class="cardContent">
                                     <ion-card-content>
                                         <div>
-                                            <ion-grid style="text-align: left;">
+                                            <ion-grid>
                                                 <ion-row class="rowBorder">
                                                     <ion-col
                                                         [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
@@ -634,7 +634,7 @@
                             <div *ngIf="actionHistoryRes && actionHistoryRes.length > 0 ">
                                 <ion-list class="notification-list ">
                                     <div class="timeline">
-                                        <ion-item *ngFor="let actionHistory of actionHistoryRes">
+                                        <ion-item lines="none" *ngFor="let actionHistory of actionHistoryRes">
 
                                             <div class="timeline-item" slot="start">
                                                 <div
@@ -682,7 +682,7 @@
                                             <ion-col size="4">
                                                 <img class="req_info" src="assets/imgs/req info.svg"
                                                     (click)="openRequestInfoDel(actionHistory, 'REQUEST_INFO')" />
-                                                <img class="req_info deligate" src="assets/imgs/delegate.svg"
+                                                <img class="req_info" src="assets/imgs/delegate.svg"
                                                     (click)="openRequestInfoDel(actionHistory, 'DELEGATE')" />
 
                                             </ion-col>
@@ -745,14 +745,14 @@
     </div>
 
 
-    <div *ngIf="messageSuccess" class="succssfullMSG">
+    <!-- <div *ngIf="messageSuccess" class="succssfullMSG">
         <ion-col size="12">
             <ion-icon class="succssfullIcon" name="checkmark"></ion-icon>
         </ion-col>
         <ion-col size="12">
             <div style="font-size: 30px !important"> {{'worklistMain, Tran_Succ' | translate}} </div>
         </ion-col>
-    </div>
+    </div> -->
 </ion-content>
 
 
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss
index 5ad7c43d..f3d460b1 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss
@@ -394,4 +394,13 @@ ion-card {
   margin: 0;
   white-space: nowrap;
   font-size: 10px;
+}
+
+ion-item {
+  margin: 10px;
+  border-bottom: 1.5px solid #ececec;
+}
+
+ion-item:last-child {
+  border: none;
 }
\ No newline at end of file
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
index a092b143..2b04584e 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
@@ -36,6 +36,7 @@ import { ApplyActionModalComponent } from '../apply-action-modal/apply-action-mo
 import { GetOpenNotificationsResponse } from 'src/app/hmg-common/services/dashbored/models/GetOpenNotificationsResponse';
 import { IonSlides } from '@ionic/angular';
 import { ActivatedRoute } from '@angular/router';
+import * as moment from "moment";
 
 @Component({
   selector: "app-worklist-main",
@@ -256,13 +257,14 @@ export class WorklistMainComponent implements OnInit {
     this.WorkListAttachObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID;
 
 
-    this.WorkListSubmitterInfoObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT;
-    this.WorkListSubmitterInfoObj.P_PAGE_NUM = 1;
+    // this.WorkListSubmitterInfoObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT;
+    // this.WorkListSubmitterInfoObj.P_PAGE_NUM = 1;
     this.WorkListSubmitterInfoObj.P_SELECTED_EMPLOYEE_NUMBER = this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER;
     this.WorkListSubmitterInfoObj.P_SELECTED_RESP_ID = -999;
-    this.WorkListSubmitterInfoObj.P_SEARCH_EMAIL_ADDRESS = "";
-    this.WorkListSubmitterInfoObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME = "";
-    this.WorkListSubmitterInfoObj.P_SEARCH_USER_NAME = "";
+    this.WorkListSubmitterInfoObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID;
+    // this.WorkListSubmitterInfoObj.P_SEARCH_EMAIL_ADDRESS = "";
+    // this.WorkListSubmitterInfoObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME = "";
+    // this.WorkListSubmitterInfoObj.P_SEARCH_USER_NAME = "";
 
     // this.getsubmitterInfo(this.WorkListSubmitterInfoObj);
 
@@ -1290,7 +1292,7 @@ export class WorklistMainComponent implements OnInit {
   showLoading(notificationList) {
     if (notificationList.length < 0) {
       return true;
-    } else if (notificationList === []) {
+    } else if (notificationList.length == 0) {
       return false;
     } else { return true; }
   }
diff --git a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts
index 8a4df9c1..7498fd51 100644
--- a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts
+++ b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { CommonService } from 'src/app/hmg-common/services/common/common.service';
 import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
 import { OfferDiscountService } from '../services/service';
-import { SocialSharing } from '@ionic-native/social-sharing/ngx';
+// import { SocialSharing } from '@ionic-native/social-sharing/ngx';
 import { DomSanitizer } from '@angular/platform-browser';
 @Component({
   selector: 'app-offer-details',
@@ -13,7 +13,7 @@ export class OfferDetailsComponent implements OnInit {
   public details: any;
   public direction: String;
   public related: any;
-  constructor(public ts: TranslatorService, private socialSharing: SocialSharing, public cs: CommonService, public offersService: OfferDiscountService, private sanitizer: DomSanitizer) { }
+  constructor(public ts: TranslatorService, public cs: CommonService, public offersService: OfferDiscountService, private sanitizer: DomSanitizer) { }
 
   ngOnInit() {
     this.direction = TranslatorService.getCurrentDirection();
@@ -45,9 +45,9 @@ export class OfferDetailsComponent implements OnInit {
       subject: this.stripHtml(offerSubject),
       files: [this.details.Banner_Image]
     }
-    this.socialSharing.shareWithOptions(options).then((result) => {
-      console.log(result);
-    })
+    // this.socialSharing.shareWithOptions(options).then((result) => {
+    //   console.log(result);
+    // })
   }
   openRelated(item) {
     this.cs.sharedService.setSharedData(item, OfferDiscountService.selected_offers);
diff --git a/Mohem/src/app/offersdiscount/offersdiscount.module.ts b/Mohem/src/app/offersdiscount/offersdiscount.module.ts
index fa0495d4..320de606 100644
--- a/Mohem/src/app/offersdiscount/offersdiscount.module.ts
+++ b/Mohem/src/app/offersdiscount/offersdiscount.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { Routes, RouterModule } from '@angular/router';
-import { SocialSharing } from '@ionic-native/social-sharing/ngx';
+// import { SocialSharing } from '@ionic-native/social-sharing/ngx';
 import { IonicModule } from '@ionic/angular';
 
 import { OffersdiscountPage } from './offersdiscount.page';
@@ -54,7 +54,7 @@ const routes: Routes = [
   ],
   declarations: [OffersdiscountPage, HomeComponent, OfferDetailsComponent, FilterComponent, LocationComponent],
   entryComponents: [FilterComponent],
-  providers: [OfferDiscountService, SocialSharing],
+  providers: [OfferDiscountService],
 
 })
 export class OffersdiscountPageModule { }
diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html
index 1407dee2..25848f2d 100644
--- a/Mohem/src/app/payslip/home/home.component.html
+++ b/Mohem/src/app/payslip/home/home.component.html
@@ -98,7 +98,7 @@
                
                   <ion-row >
                     <label class="date" for="">{{showPaySlip.PERIOD_START_DATE}}</label>
-                    <label class="label" for="">{{showPaySlip.PERIOD_END_DATE}}</label>
+                    <label class="label date-label" for="">{{showPaySlip.PERIOD_END_DATE}}</label>
                   </ion-row>
                 <div style="color: black;"> 
                   <!-- <ngx-gauge 
@@ -172,7 +172,7 @@
         </ion-row>
         <ion-row class="rowtable" >
             <ion-col [ngClass]=" direction == 'en' ? 'colPayslip' : 'colPayslip-ar'">
-                <label class="label" for=""> {{ts.trPK('payslip','deductions')}} 
+                <label class="label number" for=""> {{ts.trPK('payslip','deductions')}} 
                   
                 </label>
             </ion-col>
@@ -180,7 +180,7 @@
                 <label class="label" for="">{{GetSummaryOfPaymentList.TOTAL_DEDUCTIONS_PERCENTAGE}}</label>
             </ion-col>
             <ion-col class="colPayslips">
-                <label class="label" for="">{{GetSummaryOfPaymentList.TOTAL_DEDUCTIONS_AMOUNT}}</label>
+                <label class="label number" for="">{{GetSummaryOfPaymentList.TOTAL_DEDUCTIONS_AMOUNT}}</label>
             </ion-col>   
         </ion-row>
 
@@ -191,10 +191,10 @@
                 </label>
             </ion-col>
             <ion-col [ngClass]=" direction == 'en' ? 'colPayslip' : 'colPayslip-ar'">
-                <label class="label" for="">{{GetSummaryOfPaymentList.TOTAL_EARNINGS_PERCENTAGE}}</label>
+                <label class="label number" for="">{{GetSummaryOfPaymentList.TOTAL_EARNINGS_PERCENTAGE}}</label>
             </ion-col>
             <ion-col class="colPayslips" >
-                <label class="label" for="">{{GetSummaryOfPaymentList.TOTAL_EARNINGS_AMOUNT}}</label>
+                <label class="label number" for="">{{GetSummaryOfPaymentList.TOTAL_EARNINGS_AMOUNT}}</label>
             </ion-col>
           
         </ion-row>
@@ -205,10 +205,10 @@
                 </label>
             </ion-col>
             <ion-col [ngClass]=" direction == 'en' ? 'colPayslip' : 'colPayslip-ar'">
-                <label class="label-bold" for="">{{GetSummaryOfPaymentList.TOTAL_PAY_PERCENTAGE}}</label>
+                <label class="label-bold number" for="">{{GetSummaryOfPaymentList.TOTAL_PAY_PERCENTAGE}}</label>
             </ion-col>
             <ion-col class="colPayslips">
-                <label class="label-bold" for="">{{GetSummaryOfPaymentList.TOTAL_PAY_AMOUNT}}</label>
+                <label class="label-bold number" for="">{{GetSummaryOfPaymentList.TOTAL_PAY_AMOUNT}}</label>
             </ion-col>
         </ion-row>
 
@@ -229,10 +229,10 @@
             </ion-row>
         <ion-row class="rowtable" *ngFor="let list of GetEarningsList" >
             <ion-col [ngClass]=" direction == 'en' ? 'colPayslip' : 'colPayslip-ar'">
-                <label class="label" for="">{{list.ELEMENT_NAME}}</label>
+                <label class="label number" for="">{{list.ELEMENT_NAME}}</label>
                   </ion-col>
             <ion-col class="colPayslips">
-                <label class="label" for="">{{list.AMOUNT}}</label>
+                <label class="label number" for="">{{list.AMOUNT}}</label>
             </ion-col>
         </ion-row>
     </ion-grid>
@@ -255,7 +255,7 @@
                 <label class="label" for="">{{list.ELEMENT_NAME}}</label>
                   </ion-col>
             <ion-col class="colPayslips">
-                <label class="label" for="">{{list.AMOUNT}}</label>
+                <label class="label number" for="">{{list.AMOUNT}}</label>
             </ion-col>
         </ion-row>
     </ion-grid>
diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss
index d292672d..93880330 100644
--- a/Mohem/src/app/payslip/home/home.component.scss
+++ b/Mohem/src/app/payslip/home/home.component.scss
@@ -37,16 +37,17 @@
 
 .label {
   font-size: 15px !important;
-  text-align: center;
+  // text-align: center;
   margin-bottom: 1px;
-  margin-left: 8px;
+  font-weight: bold;
+  // margin-left: 8px;
 }
 
 .label-bold {
   font-size: 13px !important;
-  // font-weight: bold !important;
-  font-family: WorkSans-Bold;
-  margin-left: 8px;
+  font-weight: bold !important;
+  // font-family: WorkSans-Bold;
+  // margin-left: 8px;
 }
 
 .earingTotH {
@@ -224,7 +225,7 @@
 
 .result-text-container {
   padding: 0;
-  margin: 0px -5px 0px -5px;
+  // margin: 0px -5px 0px -5px;
   position: absolute;
   top: 30%;
   display: block;
@@ -234,7 +235,7 @@
   h2 {
 
     font-size: 23px;
-    font-family: WorkSans-Bold;
+    // font-family: WorkSans-Bold;
     margin: 0 auto;
     line-height: 36px;
 
@@ -246,7 +247,7 @@
     display: block;
     margin: 0 auto;
     font-size: 14px;
-    font-family: workSans-Regular;
+    // font-family: workSans-Regular;
   }
 }
 
@@ -257,7 +258,7 @@
   h2 {
 
     font-size: 25px;
-    font-family: WorkSans-Bold;
+    // font-family: WorkSans-Bold;
     margin: 0 auto;
     line-height: 36px;
 
@@ -269,7 +270,7 @@
     display: block;
     margin: 0 auto;
     font-size: 15px;
-    font-family: workSans-Regular;
+    // font-family: workSans-Regular;
   }
 }
 
@@ -280,8 +281,8 @@
 
 .green-amount {
   font-size: 13px;
-  font-family: WorkSans-Bold;
-  margin-top: -3px;
+  // font-family: WorkSans-Bold;
+  margin-top: 0px;
 }
 
 .blue-label {
@@ -291,8 +292,8 @@
 
 .blue-amount {
   font-size: 13px;
-  font-family: WorkSans-Bold;
-  margin-top: -4px;
+  // font-family: WorkSans-Bold;
+  margin-top: 0px;
 }
 
 .grids {
@@ -354,7 +355,7 @@
 .col {
 
   font-size: 15px;
-  font-family: WorkSans-Bold;
+  // font-family: WorkSans-Bold;
 }
 
 .hrTitle {
@@ -368,6 +369,16 @@
   margin-left: 58px;
   margin-bottom: 12px;
   padding-right: 5px;
+  font-weight: bold;
+  font-family: 'Inter' !important;
+}
+
+.number {
+  font-size: 'Inter' !important;
+}
+
+.date-label {
+  font-family: 'Inter' !important;
 }
 
 .div-green {
@@ -383,12 +394,6 @@
 }
 
 .div-green-ar {
-  // position: relative;
-  // left: 77%;
-  // bottom: 117px;
-  // color: black;
-  // background-color: #BE332F;
-  // width: 20%; height: 6px;
   position: relative;
   left: 4%;
   bottom: 117px;
diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts
index bd046e15..34baff0c 100644
--- a/Mohem/src/app/payslip/home/home.component.ts
+++ b/Mohem/src/app/payslip/home/home.component.ts
@@ -170,11 +170,12 @@ export class HomeComponent implements OnInit {
   // }
 
 
-  getPayslip(){
-    this.respID=-999;
+
+  getPayslip() {
+    this.respID = -999;
     const request = {
       P_SELECTED_EMPLOYEE_NUMBER: this.userData.EMPLOYEE_NUMBER,//'125346',//this.selEmp,
-      P_MENU_TYPE:"E",// 'E',//this.selMenu.List_Menu.MENU_TYPE,
+      P_MENU_TYPE: "E",// 'E',//this.selMenu.List_Menu.MENU_TYPE,
       P_SELECTED_RESP_ID: this.respID//"-999" //this.respID,
       // P_PAGE_NUM: this.P_PAGE_NUM,
       // P_PAGE_LIMIT: this.P_PAGE_LIMIT
diff --git a/Mohem/src/app/pending-transaction/home/home.component.html b/Mohem/src/app/pending-transaction/home/home.component.html
index 6ac756a4..04c33c16 100644
--- a/Mohem/src/app/pending-transaction/home/home.component.html
+++ b/Mohem/src/app/pending-transaction/home/home.component.html
@@ -93,9 +93,9 @@
 
 <ion-footer>
   <div class="centerDiv">
-    <ion-button *ngIf="!transactionDetails" class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px;    --background: transparent; width:80%" ion-button [disabled]="!isValid()" (click)="getPendingRequestDetails()">
+    <ion-button *ngIf="!transactionDetails" class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px;    --background: transparent; width:80%; --border-radius: 10px;" ion-button [disabled]="!isValid()" (click)="getPendingRequestDetails()">
       {{'general, submit' | translate}}</ion-button>
-      <ion-button *ngIf="transactionDetails && transactionDetails.length>0" class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px;    --background: transparent; width:80%" ion-button  (click)="transactionDetails=null">
+      <ion-button *ngIf="transactionDetails && transactionDetails.length>0" class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px;    --background: transparent; width:80%; --border-radius: 10px;" ion-button  (click)="transactionDetails=null">
         {{'general, reset' | translate}}</ion-button>
   </div>
 </ion-footer>
diff --git a/Mohem/src/app/profile/add-address/add-address.component.scss b/Mohem/src/app/profile/add-address/add-address.component.scss
index 1b9699be..f0cf1def 100644
--- a/Mohem/src/app/profile/add-address/add-address.component.scss
+++ b/Mohem/src/app/profile/add-address/add-address.component.scss
@@ -1,48 +1,45 @@
 .footer-button {
-  border-radius: 2px;
-  padding: 0 1.1em;
-  min-height: 45px;
-  min-width: 200px;
-}
-
-ion-label {
-  color: var(--customnavy) !important;
-}
-
-.daynamicForm-Label {
-  font-size: 16px;
-  color: #a2a5a6 !important;
-  display: block;
-  overflow: hidden;
-  -webkit-flex: 1;
-  flex: 1;
-  font-size: inherit;
-  white-space: normal;
-  padding: 5px 0px;
-  margin: 10px auto;
-  padding-left: 10px;
-}
-
-
-.header-toolbar-new {
-  --background: #BE332F;
-}
-
-.addEitOkButton {
-  white-space: normal !important;
-  text-transform: capitalize !important;
-  min-height: 45px !important;
-  min-width: 5px !important;
-  margin: 8px !important;
-  background-color: #BE332F;
-  width: 80% !important;
-  color: white !important;
-  border-radius: 16px !important;
-  --border-radius: 16px !important;
-  --box-shadow: none;
-}
-
-.country {
-  margin-top: 10px;
-  padding: 10px;
-}
\ No newline at end of file
+    border-radius: 2px;
+    padding: 0 1.1em;
+    min-height: 45px;
+    min-width: 200px;
+  }
+  
+  ion-label {
+    color: var(--customnavy) !important;
+  }
+  
+  .daynamicForm-Label {
+    font-size: 16px;
+    color: #a2a5a6 !important;
+    display: block;
+    overflow: hidden;
+    -webkit-flex: 1;
+    flex: 1;
+    font-size: inherit;
+    white-space: normal;
+    padding: 5px 0px;
+    margin: 10px auto;
+    padding-left: 10px;
+  }
+  
+  
+  .header-toolbar-new{
+    --background: #BE332F;
+  }
+  .addEitOkButton{
+    white-space: normal !important;
+    text-transform: capitalize !important;
+    min-height: 45px !important;
+    min-width: 5px !important;
+    margin: 8px !important;
+    background-color: #BE332F;
+    width: 80% !important;
+    color: white!important;
+    border-radius: 16px !important;
+    --border-radius: 16px !important;
+  }
+  .country{
+    margin-top: 10px;
+    padding: 10px;
+  }
diff --git a/Mohem/src/app/profile/add-address/add-address.component.ts b/Mohem/src/app/profile/add-address/add-address.component.ts
index cfd2ffc8..ef620aca 100644
--- a/Mohem/src/app/profile/add-address/add-address.component.ts
+++ b/Mohem/src/app/profile/add-address/add-address.component.ts
@@ -1,6 +1,6 @@
 import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { DatePicker } from '@ionic-native/date-picker/ngx';
-import { ModalController } from '@ionic/angular';
+import { ModalController, Platform } from '@ionic/angular';
 import * as moment from 'moment';
 import { AddEitResponse } from 'src/app/eit/models/add.eit.response';
 import { EitAddressRequest } from 'src/app/eit/models/eit-address.request';
@@ -76,7 +76,8 @@ export class AddAddressComponent implements OnInit {
     public ts: TranslatorService,
     private eitService: EitService,
     public datePicker: DatePicker,
-    public profileService: ProfileService
+    public profileService: ProfileService,
+    public platform: Platform
   ) {
     this.direction = TranslatorService.getCurrentLanguageName();
     this.selEmp = this.cs.sharedService.getSharedData(
@@ -160,7 +161,8 @@ export class AddAddressComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else if (feildsList[i].FORMAT_TYPE == "N") {
             // number
@@ -171,7 +173,8 @@ export class AddAddressComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else if (feildsList[i].FORMAT_TYPE == "X") {
             // standard date
@@ -190,7 +193,8 @@ export class AddAddressComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.dateInput = new DateInput(
@@ -201,7 +205,8 @@ export class AddAddressComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
           } else if (feildsList[i].FORMAT_TYPE == "Y") {
@@ -220,7 +225,8 @@ export class AddAddressComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.datetimeInput = new DateTimeInput(
@@ -231,7 +237,8 @@ export class AddAddressComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
             const elem = document.getElementById(
@@ -253,7 +260,8 @@ export class AddAddressComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.timeInput = new TimeInput(
@@ -264,7 +272,8 @@ export class AddAddressComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
           }
@@ -278,7 +287,8 @@ export class AddAddressComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else {
             this.selectInput = new SelectInput(
@@ -288,7 +298,8 @@ export class AddAddressComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
             this.fillDropdownList(
               feildsList[i].SEGMENT_NAME,
@@ -447,6 +458,7 @@ export class AddAddressComponent implements OnInit {
   }
 
   bindHtmlElemEvents(id, obj) {
+    const isIOS = this.platform.is('ios');
     const elem = document.getElementById(id);
     console.log(elem);
     console.log(obj);
@@ -456,7 +468,21 @@ export class AddAddressComponent implements OnInit {
     if (elemType == "SELECT") changeEvent = "change";
 
     try {
+      if (isIOS && (obj.FORMAT_TYPE == "N" || obj.FORMAT_TYPE == "C")) {
+        elem.addEventListener("ionFocus", event => {
+          setTimeout(()=>{
+            console.log(event.target as Element);
+            var e = event.target as Element;
+            e.scrollIntoView(true);
+          },1000)
+        })
+      }
       elem.addEventListener(changeEvent, e => {
+        if (obj.FORMAT_TYPE == "N") {
+          const maxSize = obj.MAXIMUM_SIZE;
+          const value = (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value;
+          (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value = value.length > maxSize ? value.substring(0, maxSize) : value;
+        }
         elem.classList.remove("requiredClassElm");
         if (
           obj.CHILD_SEGMENTS_VS_Splited &&
@@ -1114,6 +1140,7 @@ export class AddAddressComponent implements OnInit {
           }
           if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) {
             elem.classList.add("requiredClassElm");
+            this.cs.redToastPK("eit", "required-text");
             //this.common.showRequiredMsg();
             return false;
           } else {
@@ -1152,6 +1179,7 @@ export class AddAddressComponent implements OnInit {
           }
           if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !varcharValue) {
             x.classList.add("requiredClassElm");
+            this.cs.redToastPK("eit", "required-text");
             //this.common.showRequiredMsg();
             return false;
           } else {
@@ -1174,6 +1202,7 @@ export class AddAddressComponent implements OnInit {
         textValue = x.value;
         if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) {
           x.classList.add("requiredClassElm");
+          this.cs.redToastPK("eit", "required-text");
           //this.common.showRequiredMsg();
           return false;
         } else {
diff --git a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss
index 1b9699be..cc3a0615 100644
--- a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss
+++ b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss
@@ -1,9 +1,44 @@
 .footer-button {
-  border-radius: 2px;
-  padding: 0 1.1em;
-  min-height: 45px;
-  min-width: 200px;
-}
+    border-radius: 2px;
+    padding: 0 1.1em;
+    min-height: 45px;
+    min-width: 200px;
+  }
+  
+  ion-label {
+    color: var(--customnavy) !important;
+  }
+  
+  .daynamicForm-Label {
+    font-size: 16px;
+    color: #a2a5a6 !important;
+    display: block;
+    overflow: hidden;
+    -webkit-flex: 1;
+    flex: 1;
+    font-size: inherit;
+    white-space: normal;
+    padding: 5px 0px;
+    margin: 10px auto;
+    padding-left: 10px;
+  }
+  
+  
+  .header-toolbar-new{
+    --background: #024d71;
+  }
+  .addEitOkButton{
+    white-space: normal !important;
+    text-transform: capitalize !important;
+    min-height: 45px !important;
+    min-width: 5px !important;
+    margin: 8px !important;
+    background-color: #44A7A1;
+    width: 80% !important;
+    color: white!important;
+    border-radius: 16px !important;
+    --border-radius: 16px !important;
+  }
 
 ion-label {
   color: var(--customnavy) !important;
diff --git a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts
index a3fbf4d5..0001bb04 100644
--- a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts
+++ b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts
@@ -3,7 +3,7 @@ import { Component, OnInit, ViewChild, ElementRef } from "@angular/core";
 import { MenuEntry } from "src/app/hmg-common/services/menu/models/menu.entry";
 import { MenuResponse } from "src/app/hmg-common/services/menu/models/menu-response";
 import { BasicRequest } from "../models/basic.request";
-import { ModalController } from "@ionic/angular";
+import { ModalController, Platform } from "@ionic/angular";
 import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service";
 import { EITTransactionsRequest } from "../models/EITTransactionsReq";
 import { ProfileService } from "../service/profile.service";
@@ -79,7 +79,8 @@ export class AddBasicDetailsComponent implements OnInit {
     private ts: TranslatorService,
     private profileService: ProfileService,
     public datePicker: DatePicker,
-    public router: ActivatedRoute
+    public router: ActivatedRoute,
+    public platform: Platform
   ) {
 
     this.router.queryParams.subscribe(params => {
@@ -199,7 +200,8 @@ export class AddBasicDetailsComponent implements OnInit {
             defaultValText,
             feildsList[i].MOBILE_ENABLED,
             feildsList[i].DISPLAY_FLAG,
-            feildsList[i].REQUIRED_FLAG
+            feildsList[i].REQUIRED_FLAG,
+            feildsList[i].REQ_COL_TIP
           );
         } else if (feildsList[i].DATATYPE == "VARCHAR2" && feildsList[i].ObjectValuesList !== null) {
           this.selectInput = new SelectInput(
@@ -209,7 +211,8 @@ export class AddBasicDetailsComponent implements OnInit {
             containerId,
             feildsList[i].MOBILE_ENABLED,
             feildsList[i].DISPLAY_FLAG,
-            feildsList[i].REQUIRED_FLAG
+            feildsList[i].REQUIRED_FLAG,
+            feildsList[i].REQ_COL_TIP
           );
           this.fillStaticDropdownList(
             feildsList[i].SEGMENT_NAME,
@@ -224,7 +227,8 @@ export class AddBasicDetailsComponent implements OnInit {
             containerId,
             feildsList[i].MOBILE_ENABLED,
             feildsList[i].DISPLAY_FLAG,
-            feildsList[i].REQUIRED_FLAG
+            feildsList[i].REQUIRED_FLAG,
+            feildsList[i].REQ_COL_TIP
           );
         } else if (feildsList[i].DATATYPE == "DATE" && this.targetValue === 'new') {
           this.dateInput = new DateInput(
@@ -235,7 +239,8 @@ export class AddBasicDetailsComponent implements OnInit {
             feildsList[i].MOBILE_ENABLED,
             feildsList[i].DISPLAY_FLAG,
             feildsList[i].REQUIRED_FLAG,
-            this.direction
+            this.direction,
+            feildsList[i].REQ_COL_TIP
           );
 
         }
@@ -279,6 +284,7 @@ export class AddBasicDetailsComponent implements OnInit {
           if (this.targetValue === 'new') {
             if (this.eitColResponse[i].REQUIRED_FLAG == "Y" && !elemVal) {
               elem.classList.add("requiredClassElm");
+              this.cs.redToastPK("eit", "required-text");
               return false;
             } else {
               elem.classList.remove("requiredClassElm");
@@ -311,6 +317,7 @@ export class AddBasicDetailsComponent implements OnInit {
           if (x !== null) {
             if (this.eitColResponse[i].REQUIRED_FLAG == "Y" && !varcharValue) {
               x.classList.add("requiredClassElm");
+              this.cs.redToastPK("eit", "required-text");
               return false;
             } else {
               x.classList.remove("requiredClassElm");
@@ -333,6 +340,7 @@ export class AddBasicDetailsComponent implements OnInit {
         if (x !== null) {
           if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) {
             x.classList.add("requiredClassElm");
+            this.cs.redToastPK("eit", "required-text");
             return false;
           } else {
             x.classList.remove("requiredClassElm");
@@ -400,7 +408,8 @@ export class AddBasicDetailsComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList.REQ_COL_TIP
             );
           } else if (feildsList[i].FORMAT_TYPE == "N") {
             this.numberInput = new NumberInput(
@@ -410,7 +419,8 @@ export class AddBasicDetailsComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else if (feildsList[i].FORMAT_TYPE == "X") {
             // standard date
@@ -429,7 +439,8 @@ export class AddBasicDetailsComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.dateInput = new DateInput(
@@ -440,7 +451,8 @@ export class AddBasicDetailsComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
           } else if (feildsList[i].FORMAT_TYPE == "Y") {
@@ -459,7 +471,8 @@ export class AddBasicDetailsComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.datetimeInput = new DateTimeInput(
@@ -470,7 +483,8 @@ export class AddBasicDetailsComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
             const elem = document.getElementById(
@@ -492,7 +506,8 @@ export class AddBasicDetailsComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.timeInput = new TimeInput(
@@ -503,7 +518,8 @@ export class AddBasicDetailsComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
           }
@@ -517,7 +533,8 @@ export class AddBasicDetailsComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else {
             this.selectInput = new SelectInput(
@@ -527,7 +544,8 @@ export class AddBasicDetailsComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
             this.fillDropdownList(
               feildsList[i].SEGMENT_NAME,
@@ -704,6 +722,7 @@ export class AddBasicDetailsComponent implements OnInit {
   }
 
   bindHtmlElemEvents(id, obj) {
+    const isIOS = this.platform.is('ios');
     const elem = document.getElementById(id);
     console.log(elem);
     console.log(obj);
@@ -713,7 +732,23 @@ export class AddBasicDetailsComponent implements OnInit {
     if (elemType == "SELECT") changeEvent = "change";
 
     try {
+
+      if (isIOS && (obj.FORMAT_TYPE == "N" || obj.FORMAT_TYPE == "C")) {
+        elem.addEventListener("ionFocus", event => {
+          setTimeout(()=>{
+            console.log(event.target as Element);
+            var e = event.target as Element;
+            e.scrollIntoView(true);
+          },1000)
+        })
+      }
+
       elem.addEventListener(changeEvent, e => {
+        if (obj.FORMAT_TYPE == "N") {
+          const maxSize = obj.MAXIMUM_SIZE;
+          const value = (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value;
+          (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value = value.length > maxSize ? value.substring(0, maxSize) : value;
+        }
         elem.classList.remove("requiredClassElm");
         if (
           obj.CHILD_SEGMENTS_VS_Splited &&
@@ -1423,6 +1458,7 @@ export class AddBasicDetailsComponent implements OnInit {
           }
           if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) {
             elem.classList.add("requiredClassElm");
+            this.cs.redToastPK("eit", "required-text");
             //this.common.showRequiredMsg();
             return false;
           } else {
@@ -1461,6 +1497,7 @@ export class AddBasicDetailsComponent implements OnInit {
           }
           if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !varcharValue) {
             x.classList.add("requiredClassElm");
+            this.cs.redToastPK("eit", "required-text");
             //this.common.showRequiredMsg();
             return false;
           } else {
@@ -1483,6 +1520,7 @@ export class AddBasicDetailsComponent implements OnInit {
         textValue = x.value;
         if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) {
           x.classList.add("requiredClassElm");
+          this.cs.redToastPK("eit", "required-text");
           //this.common.showRequiredMsg();
           return false;
         } else {
diff --git a/Mohem/src/app/profile/add-update-contact/add-update-contact.component.ts b/Mohem/src/app/profile/add-update-contact/add-update-contact.component.ts
index f8aaf42a..557c5762 100644
--- a/Mohem/src/app/profile/add-update-contact/add-update-contact.component.ts
+++ b/Mohem/src/app/profile/add-update-contact/add-update-contact.component.ts
@@ -232,7 +232,8 @@ export class AddUpdateContactComponent implements OnInit {
             defaultValText,
             feildsList[i].MOBILE_ENABLED,
             feildsList[i].DISPLAY_FLAG,
-            feildsList[i].REQUIRED_FLAG
+            feildsList[i].REQUIRED_FLAG,
+            feildsList[i].REQ_COL_TIP
           );
         } else if (feildsList[i].DATATYPE == "VARCHAR2" && feildsList[i].ObjectValuesList !== null) {
           this.selectInput = new SelectInput(
@@ -242,7 +243,8 @@ export class AddUpdateContactComponent implements OnInit {
             containerId,
             feildsList[i].MOBILE_ENABLED,
             feildsList[i].DISPLAY_FLAG,
-            feildsList[i].REQUIRED_FLAG
+            feildsList[i].REQUIRED_FLAG,
+            feildsList[i].REQ_COL_TIP
           );
           this.fillStaticDropdownList(
             feildsList[i].SEGMENT_NAME,
@@ -257,7 +259,8 @@ export class AddUpdateContactComponent implements OnInit {
             containerId,
             feildsList[i].MOBILE_ENABLED,
             feildsList[i].DISPLAY_FLAG,
-            feildsList[i].REQUIRED_FLAG
+            feildsList[i].REQUIRED_FLAG,
+            feildsList[i].REQ_COL_TIP
           );
         } else if (feildsList[i].DATATYPE == "DATE") {
           this.dateInput = new DateInput(
@@ -268,7 +271,8 @@ export class AddUpdateContactComponent implements OnInit {
             feildsList[i].MOBILE_ENABLED,
             feildsList[i].DISPLAY_FLAG,
             feildsList[i].REQUIRED_FLAG,
-            this.direction
+            this.direction,
+            feildsList[i].REQ_COL_TIP
           );
 
         }
@@ -429,7 +433,8 @@ export class AddUpdateContactComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else if (feildsList[i].FORMAT_TYPE == "N") {
             this.numberInput = new NumberInput(
@@ -439,7 +444,8 @@ export class AddUpdateContactComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else if (feildsList[i].FORMAT_TYPE == "X") {
             // standard date
@@ -458,7 +464,8 @@ export class AddUpdateContactComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.dateInput = new DateInput(
@@ -469,7 +476,8 @@ export class AddUpdateContactComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
           } else if (feildsList[i].FORMAT_TYPE == "Y") {
@@ -488,7 +496,8 @@ export class AddUpdateContactComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.datetimeInput = new DateTimeInput(
@@ -499,7 +508,8 @@ export class AddUpdateContactComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
             const elem = document.getElementById(
@@ -521,7 +531,8 @@ export class AddUpdateContactComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.timeInput = new TimeInput(
@@ -532,7 +543,8 @@ export class AddUpdateContactComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
           }
@@ -546,7 +558,8 @@ export class AddUpdateContactComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else {
             this.selectInput = new SelectInput(
@@ -556,7 +569,8 @@ export class AddUpdateContactComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
             if (isDff) {
               this.fillDropdownListDff(
diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.html b/Mohem/src/app/profile/confirm-address/confirm-address.component.html
index a3a64748..b4eb950d 100644
--- a/Mohem/src/app/profile/confirm-address/confirm-address.component.html
+++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.html
@@ -1,9 +1,14 @@
-<ion-header>
+<!-- <ion-header>
   <ion-toolbar class="header-toolbar-new">
     <nav-buttons></nav-buttons>
     <ion-title [ngClass]=" direction === 'en' ?  'title' : 'title-ar'"  color="light">{{headerTitle}}</ion-title>
   </ion-toolbar>
-</ion-header>
+</ion-header> -->
+
+<app-generic-header
+  showBack="true"
+  [headerText]="headerTitle">
+</app-generic-header>
 
 
 <ion-content>
@@ -11,7 +16,11 @@
 <ion-grid>
   <ion-row style="margin-top: 20px;margin-left: 12px;">
   <ion-col>
-  <div size="10" [ngClass]=" direction === 'en' ?  'approvalTitle' : 'approvalTitle-ar'" >{{'general, addAttach' | translate}}</div>
+  <div size="10" [ngClass]=" direction === 'en' ?  'approvalTitle' : 'approvalTitle-ar'" >
+    {{'general, addAttach' | translate}}
+    <span *ngIf="isAttachmentGET_MENU === 'Y'">*</span>
+    <div *ngIf="selMenu.GetMenuEntriesList.REQ_ATTACHMENT_TIP" (click)="showToolTip(selMenu.GetMenuEntriesList.REQ_ATTACHMENT_TIP)" class='toolTip-inside'><ion-icon style='font-size: 20px' name='information-circle-outline'></ion-icon> </div>
+  </div>
   </ion-col>
   <ion-col style="padding-left: 7%;" size="2">
     <div class="fileDiv">
@@ -261,7 +270,7 @@
 
 <ion-footer>
   <div class="centerDiv">
-    <ion-button class="confirmEitOkButton" color="customnavy" ion-button (click)="openSubmitModal()">
+    <ion-button class="confirmEitOkButton" [disabled] ="isAttachmentGET_MENU ==='Y' && attachListOver.length ===0" color="customnavy" ion-button (click)="openSubmitModal()">
       {{ (isDelete ? 'general, delete' : 'general, submit') | translate }}</ion-button>
   </div>
 </ion-footer>
\ No newline at end of file
diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss
index ad8fbd92..64149050 100644
--- a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss
+++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss
@@ -106,170 +106,163 @@
     }
 
   }
-}
-
-
-
-
-
-
-.timeline {
-  position: relative;
-  margin: 15px 0 0 0;
-  //   border-bottom: solid 1px var(--cusgray);
-}
-
-.timeline:before {
-
-  content: '';
-  position: inherit !important;
-  top: 0;
-  bottom: 0;
-  width: 4px;
-  // background: #e4e4e4;
-  z-index: 1;
-  left: 35px;
-  /* margin-left: -10px; */
-  /* z-index: 1; */
-}
-
-.timeline .timeline-thumb {
-
-  border-radius: 500px;
-  width: 70px !important;
-  z-index: 2;
-  position: absolute;
-  left: 0px;
-  // :root[dir="ltr"]{
-  //    left: 37px;
-  // }
-  // :root[dir="rtl"]{
-  //     right: 37px;
-  // }
-  float: right;
-  top: 9px;
-}
-
-.timeline .timeline-thumb.timeline-icon {
-  height: 70px;
-  //   text-align: center;
-  //   color: white;
-  //   border: 5px solid #CBD0D3;
-  //   transform: scale(0.2);
-}
-
-
-
-.timeline .timeline-item {
-  width: 40px;
-
-}
-
-.timeline .timeline-stats {
-  position: relative;
-  font-size: 12px;
-  color: var(--darkgray);
-
-}
-
-.empImge {
-  border-radius: 50%;
-  width: 100%;
-  height: 100%;
-  border: #dedede solid 1px;
-
-}
-
-.empImgeRep {
-  border-radius: 50% !important;
-  width: 80px;
-  height: 80px;
-  border: #dedede solid 1px;
-}
-
-.line {
-  padding-bottom: 87px;
-}
-
-.attachLable {
-  position: absolute;
-  top: 0px;
-  z-index: 0;
-  background: #c6903e;
-  color: #fff;
-  border-radius: 50%;
-  border: 0px;
-  width: 24px;
-  height: 24px;
-  text-align: center;
-  font-size: 5px;
-}
-
-.removeLable {
-  top: 0px;
-  z-index: 0;
-  background: #d8252d;
-  color: #fff;
-  border-radius: 50%;
-  border: 0px;
-  width: 20px;
-  height: 20px;
-  text-align: center;
-  font-size: 5px;
-}
-
-.note-modal {
-  // width: 90%;
-  // height: 50%;
-  // top: 20%;
-  // left: 5%;
-  // right: 5%;
-  // bottom: 5%;
-  background: rgba(0, 0, 0, 0.5) !important;
-  padding: 30% 10% !important;
-  --height: 12cm !important;
-  // --width: 80% !important;
-  --border-radius: 20px;
-
-}
-
-.header-toolbar-new {
-  --background: #BE332F;
-}
-
-.title {
-  margin-top: -37px;
-  margin-left: 85px;
-}
-
-.title-ar {
-  margin-top: -37px;
-  margin-right: 101px;
-}
-
-.confirmEitOkButton {
-  white-space: normal !important;
-  text-transform: capitalize !important;
-  min-height: 45px !important;
-  min-width: 5px !important;
-  margin: 8px !important;
-  background-color: #BE332F;
-  width: 80% !important;
-  color: white !important;
-  border-radius: 16px !important;
-  --border-radius: 16px !important;
-  --box-shadow: none;
-}
-
-.approvalTitle-ar {
-  font-weight: bold;
-  font-size: 16px;
-  text-align: right;
-
-}
-
-.approvalTitle {
-  font-weight: bold;
-  font-size: 16px;
-  text-align: left;
-}
\ No newline at end of file
+  
+  
+  
+  
+  
+  
+  .timeline {
+      position: relative;
+      margin: 15px 0 0 0;
+    //   border-bottom: solid 1px var(--cusgray);
+  }
+  
+  .timeline:before {
+   
+    content: '';
+    position: inherit !important;
+    top: 0;
+    bottom: 0;
+    width: 4px;
+    // background: #e4e4e4;
+    z-index: 1;
+    left: 35px;
+    /* margin-left: -10px; */
+    /* z-index: 1; */
+  }
+  
+  .timeline .timeline-thumb {
+   
+    border-radius: 500px;
+    width: 70px !important;
+    z-index: 2;
+    position: absolute;
+    left: 0px;
+    // :root[dir="ltr"]{
+    //    left: 37px;
+    // }
+    // :root[dir="rtl"]{
+    //     right: 37px;
+    // }
+    float: right;
+    top: 9px;
+  }
+  
+  .timeline .timeline-thumb.timeline-icon {
+      height: 70px;
+    //   text-align: center;
+    //   color: white;
+    //   border: 5px solid #CBD0D3;
+    //   transform: scale(0.2);
+  }
+  
+  
+  
+  .timeline .timeline-item {
+    width: 40px;
+  
+  }
+  
+  .timeline .timeline-stats {
+      position: relative;
+      font-size: 12px;
+      color: var(--darkgray);
+    
+  }
+  
+  .empImge{
+    border-radius: 50%;
+    width:100%;
+    height: 100%;
+    border: #dedede solid 1px;
+  
+  }
+  .empImgeRep {
+    border-radius: 50% !important;
+    width: 80px;
+    height: 80px;
+    border: #dedede solid 1px;
+  }
+  
+  .line{
+    padding-bottom:87px;
+  }
+  
+  .attachLable{
+    position: absolute;
+      top: 0px;
+      z-index: 0;
+      background: #44A7A1;
+      color: #fff;
+      border-radius: 50%;
+      border: 0px;
+      width: 24px;
+      height: 24px;
+      text-align: center;
+      font-size: 5px;
+  }
+  
+  .removeLable{
+    top: 0px;
+    z-index: 0;
+    background: #d8252d;
+    color: #fff;
+    border-radius: 50%;
+    border: 0px;
+    width: 20px;
+    height: 20px;
+    text-align: center;
+    font-size: 5px;
+  }
+  
+  .note-modal {
+    // width: 90%;
+    // height: 50%;
+    // top: 20%;
+    // left: 5%;
+    // right: 5%;
+    // bottom: 5%;
+    background: rgba(0, 0, 0, 0.5) !important;
+    padding: 30% 10% !important;
+    --height: 12cm !important;
+    // --width: 80% !important;
+    --border-radius:20px;
+    
+  }
+  .header-toolbar-new{
+    --background: #024d71;
+  }
+  .title{
+    margin-top: -37px;
+    margin-left: 85px;
+  }
+  .title-ar{
+    margin-top: -37px;
+      margin-right: 101px;
+  }
+  .confirmEitOkButton{
+    white-space: normal !important;
+    text-transform: capitalize !important;
+    min-height: 45px !important;
+    min-width: 5px !important;
+    margin: 8px !important;
+    background-color: #44A7A1;
+    width: 80% !important;
+    color: white!important;
+    border-radius: 16px !important;
+    --border-radius: 16px !important;
+  }
+  
+  .approvalTitle-ar{
+    font-weight: bold;
+    font-size: 16px;
+    text-align: right;
+  
+  }
+  .approvalTitle{
+    font-weight: bold;
+    font-size: 16px;
+    text-align: left;
+  }
+  
diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.ts b/Mohem/src/app/profile/confirm-address/confirm-address.component.ts
index b64746bc..06597c82 100644
--- a/Mohem/src/app/profile/confirm-address/confirm-address.component.ts
+++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.ts
@@ -64,6 +64,8 @@ export class ConfirmAddressComponent implements OnInit {
   filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'];
   direction: string;
   isContact: boolean;
+  isAttachmentGET_MENU: string = 'N';
+
 
   constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService, public profileService: ProfileService) {
     this.direction = TranslatorService.getCurrentLanguageName()
@@ -78,6 +80,8 @@ export class ConfirmAddressComponent implements OnInit {
     this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false);
     this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false);
     this.eitRequest = this.cs.sharedService.getSharedData(EitRequest.SHARED_DATA, false);
+    this.isAttachmentGET_MENU = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED;
+
     // this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isResubmit;
     // if (this.isResubmitEIT) {
     //   this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING ** 
@@ -267,7 +271,7 @@ export class ConfirmAddressComponent implements OnInit {
       //if(this.isResubmitEIT==false){
       // let msg: string = this.ts.trPK("eit", "approval-message-success");
       // this.cs.presentAlert(msg);
-      this.cs.greenToastPK("eit", "approval-message-success")
+      this.cs.greenToastPK("eit", "contact-approval-message-success")
       // }
       // this.navCtrl.popToRoot();
       this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED);
@@ -605,6 +609,8 @@ export class ConfirmAddressComponent implements OnInit {
 
   // }
 
-
+  showToolTip(toolTip: any) {
+    this.cs.yellowToast(toolTip);
+  }
 
 }
diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html
index 0505227b..ce1a1e77 100644
--- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html
+++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html
@@ -1,9 +1,15 @@
-<ion-header>
+<!-- <ion-header>
   <ion-toolbar class="header-toolbar-new">
     <nav-buttons></nav-buttons>
     <ion-title [ngClass]=" direction === 'en' ?  'title' : 'title-ar'"  color="light">{{headerTitle}}</ion-title>
   </ion-toolbar>
-</ion-header>
+</ion-header> -->
+
+<app-generic-header
+  showBack="true"
+  [headerText]="headerTitle"
+  >
+</app-generic-header>
 
 
 <ion-content>
@@ -11,7 +17,11 @@
 <ion-grid>
   <ion-row style="margin-top: 20px;margin-left: 12px;">
   <ion-col>
-  <div size="10" [ngClass]=" direction === 'en' ?  'approvalTitle' : 'approvalTitle-ar'" >{{'general, addAttach' | translate}}</div>
+  <div size="10" [ngClass]=" direction === 'en' ?  'approvalTitle' : 'approvalTitle-ar'" >
+    {{'general, addAttach' | translate}}
+    <span *ngIf="isAttachmentGET_MENU === 'Y'">*</span>
+    <div *ngIf="selMenu.GetMenuEntriesList.REQ_ATTACHMENT_TIP" (click)="showToolTip(selMenu.GetMenuEntriesList.REQ_ATTACHMENT_TIP)" class='toolTip-inside'><ion-icon style='font-size: 20px' name='information-circle-outline'></ion-icon> </div>
+  </div>
   </ion-col>
   <ion-col style="padding-left: 7%;" size="2">
     <div class="fileDiv">
@@ -122,7 +132,7 @@
 
 <ion-footer>
   <div class="centerDiv">
-    <ion-button class="confirmEitOkButton" color="customnavy" ion-button (click)="openSubmitModal()">
+    <ion-button class="confirmEitOkButton" [disabled] ="isAttachmentGET_MENU ==='Y' && attachListOver.length ===0" color="customnavy" ion-button (click)="openSubmitModal()">
       {{ 'general, submit' | translate }}</ion-button>
   </div>
 </ion-footer>
\ No newline at end of file
diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss
index ad8fbd92..c539c320 100644
--- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss
+++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss
@@ -106,170 +106,163 @@
     }
 
   }
-}
-
-
-
-
-
-
-.timeline {
-  position: relative;
-  margin: 15px 0 0 0;
-  //   border-bottom: solid 1px var(--cusgray);
-}
-
-.timeline:before {
-
-  content: '';
-  position: inherit !important;
-  top: 0;
-  bottom: 0;
-  width: 4px;
-  // background: #e4e4e4;
-  z-index: 1;
-  left: 35px;
-  /* margin-left: -10px; */
-  /* z-index: 1; */
-}
-
-.timeline .timeline-thumb {
-
-  border-radius: 500px;
-  width: 70px !important;
-  z-index: 2;
-  position: absolute;
-  left: 0px;
-  // :root[dir="ltr"]{
-  //    left: 37px;
-  // }
-  // :root[dir="rtl"]{
-  //     right: 37px;
-  // }
-  float: right;
-  top: 9px;
-}
-
-.timeline .timeline-thumb.timeline-icon {
-  height: 70px;
-  //   text-align: center;
-  //   color: white;
-  //   border: 5px solid #CBD0D3;
-  //   transform: scale(0.2);
-}
-
-
-
-.timeline .timeline-item {
-  width: 40px;
-
-}
-
-.timeline .timeline-stats {
-  position: relative;
-  font-size: 12px;
-  color: var(--darkgray);
-
-}
-
-.empImge {
-  border-radius: 50%;
-  width: 100%;
-  height: 100%;
-  border: #dedede solid 1px;
-
-}
-
-.empImgeRep {
-  border-radius: 50% !important;
-  width: 80px;
-  height: 80px;
-  border: #dedede solid 1px;
-}
-
-.line {
-  padding-bottom: 87px;
-}
-
-.attachLable {
-  position: absolute;
-  top: 0px;
-  z-index: 0;
-  background: #c6903e;
-  color: #fff;
-  border-radius: 50%;
-  border: 0px;
-  width: 24px;
-  height: 24px;
-  text-align: center;
-  font-size: 5px;
-}
-
-.removeLable {
-  top: 0px;
-  z-index: 0;
-  background: #d8252d;
-  color: #fff;
-  border-radius: 50%;
-  border: 0px;
-  width: 20px;
-  height: 20px;
-  text-align: center;
-  font-size: 5px;
-}
-
-.note-modal {
-  // width: 90%;
-  // height: 50%;
-  // top: 20%;
-  // left: 5%;
-  // right: 5%;
-  // bottom: 5%;
-  background: rgba(0, 0, 0, 0.5) !important;
-  padding: 30% 10% !important;
-  --height: 12cm !important;
-  // --width: 80% !important;
-  --border-radius: 20px;
-
-}
-
-.header-toolbar-new {
-  --background: #BE332F;
-}
-
-.title {
-  margin-top: -37px;
-  margin-left: 85px;
-}
-
-.title-ar {
-  margin-top: -37px;
-  margin-right: 101px;
-}
-
-.confirmEitOkButton {
-  white-space: normal !important;
-  text-transform: capitalize !important;
-  min-height: 45px !important;
-  min-width: 5px !important;
-  margin: 8px !important;
-  background-color: #BE332F;
-  width: 80% !important;
-  color: white !important;
-  border-radius: 16px !important;
-  --border-radius: 16px !important;
-  --box-shadow: none;
-}
-
-.approvalTitle-ar {
-  font-weight: bold;
-  font-size: 16px;
-  text-align: right;
-
-}
-
-.approvalTitle {
-  font-weight: bold;
-  font-size: 16px;
-  text-align: left;
-}
\ No newline at end of file
+  
+  
+  
+  
+  
+  
+  .timeline {
+      position: relative;
+      margin: 15px 0 0 0;
+    //   border-bottom: solid 1px var(--cusgray);
+  }
+  
+  .timeline:before {
+   
+    content: '';
+    position: inherit !important;
+    top: 0;
+    bottom: 0;
+    width: 4px;
+    // background: #e4e4e4;
+    z-index: 1;
+    left: 35px;
+    /* margin-left: -10px; */
+    /* z-index: 1; */
+  }
+  
+  .timeline .timeline-thumb {
+   
+    border-radius: 500px;
+    width: 70px !important;
+    z-index: 2;
+    position: absolute;
+    left: 0px;
+    // :root[dir="ltr"]{
+    //    left: 37px;
+    // }
+    // :root[dir="rtl"]{
+    //     right: 37px;
+    // }
+    float: right;
+    top: 9px;
+  }
+  
+  .timeline .timeline-thumb.timeline-icon {
+      height: 70px;
+    //   text-align: center;
+    //   color: white;
+    //   border: 5px solid #CBD0D3;
+    //   transform: scale(0.2);
+  }
+  
+  
+  
+  .timeline .timeline-item {
+    width: 40px;
+  
+  }
+  
+  .timeline .timeline-stats {
+      position: relative;
+      font-size: 12px;
+      color: var(--darkgray);
+    
+  }
+  
+  .empImge{
+    border-radius: 50%;
+    width:100%;
+    height: 100%;
+    border: #dedede solid 1px;
+  
+  }
+  .empImgeRep {
+    border-radius: 50% !important;
+    width: 80px;
+    height: 80px;
+    border: #dedede solid 1px;
+  }
+  
+  .line{
+    padding-bottom:87px;
+  }
+  
+  .attachLable{
+    position: absolute;
+      top: 0px;
+      z-index: 0;
+      background: #44A7A1;
+      color: #fff;
+      border-radius: 50%;
+      border: 0px;
+      width: 24px;
+      height: 24px;
+      text-align: center;
+      font-size: 5px;
+  }
+  
+  .removeLable{
+    top: 0px;
+    z-index: 0;
+    background: #d8252d;
+    color: #fff;
+    border-radius: 50%;
+    border: 0px;
+    width: 20px;
+    height: 20px;
+    text-align: center;
+    font-size: 5px;
+  }
+  
+  .note-modal {
+    // width: 90%;
+    // height: 50%;
+    // top: 20%;
+    // left: 5%;
+    // right: 5%;
+    // bottom: 5%;
+    background: rgba(0, 0, 0, 0.5) !important;
+    padding: 30% 10% !important;
+    --height: 12cm !important;
+    // --width: 80% !important;
+    --border-radius:20px;
+    
+  }
+  .header-toolbar-new{
+    --background: #024d71;
+  }
+  .title{
+    margin-top: -37px;
+    margin-left: 85px;
+  }
+  .title-ar{
+    margin-top: -37px;
+      margin-right: 101px;
+  }
+  .confirmEitOkButton{
+    white-space: normal !important;
+    text-transform: capitalize !important;
+    min-height: 45px !important;
+    min-width: 5px !important;
+    margin: 8px !important;
+    background-color: #44A7A1;
+    width: 80% !important;
+    color: white!important;
+    border-radius: 16px !important;
+    --border-radius: 16px !important
+  }
+  
+  .approvalTitle-ar{
+    font-weight: bold;
+    font-size: 16px;
+    text-align: right;
+  
+  }
+  .approvalTitle{
+    font-weight: bold;
+    font-size: 16px;
+    text-align: left;
+  }
+  
diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts
index 5c9dca61..043704a7 100644
--- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts
+++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts
@@ -63,7 +63,7 @@ export class ConfirmBasicDetailsComponent implements OnInit {
   indexLastObj: any = 0;
   filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'];
   direction: string;
-
+  isAttachmentGET_MENU: string = 'N';
 
   constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService, public profileService: ProfileService) {
     this.direction = TranslatorService.getCurrentLanguageName()
@@ -76,7 +76,7 @@ export class ConfirmBasicDetailsComponent implements OnInit {
     this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false);
     this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false);
     this.basicRequest = this.cs.sharedService.getSharedData(BasicRequest.SHARED_DATA, false);
-
+    this.isAttachmentGET_MENU = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED;
     this.selEmp = this.basicRequest.P_SELECTED_EMPLOYEE_NUMBER;
 
     this.menuType = this.selMenu.List_Menu.MENU_TYPE;
@@ -194,7 +194,7 @@ export class ConfirmBasicDetailsComponent implements OnInit {
       this.isSubmitBtnClicked = true;
       // let msg: string = this.ts.trPK("eit", "approval-message-success");
       // this.cs.presentAlert(msg);
-      this.cs.greenToastPK("eit", "approval-message-success");
+      this.cs.greenToastPK("eit", "basic-approval-message-success");
       this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED);
       // this.cs.openProfile('sideMenu');
       this.cs.openHome();
@@ -436,5 +436,9 @@ export class ConfirmBasicDetailsComponent implements OnInit {
     }
   }
 
+  showToolTip(toolTip: any) {
+    this.cs.yellowToast(toolTip);
+  }
+
 }
 
diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html
index 0505227b..5fe909cb 100644
--- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html
+++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.html
@@ -11,7 +11,11 @@
 <ion-grid>
   <ion-row style="margin-top: 20px;margin-left: 12px;">
   <ion-col>
-  <div size="10" [ngClass]=" direction === 'en' ?  'approvalTitle' : 'approvalTitle-ar'" >{{'general, addAttach' | translate}}</div>
+  <div size="10" [ngClass]=" direction === 'en' ?  'approvalTitle' : 'approvalTitle-ar'" >
+    {{'general, addAttach' | translate}}
+    <span *ngIf="isAttachmentGET_MENU === 'Y'">*</span>
+    <div *ngIf="selMenu.GetMenuEntriesList.REQ_ATTACHMENT_TIP" (click)="showToolTip(selMenu.GetMenuEntriesList.REQ_ATTACHMENT_TIP)" class='toolTip-inside'><ion-icon style='font-size: 20px' name='information-circle-outline'></ion-icon> </div>
+  </div>
   </ion-col>
   <ion-col style="padding-left: 7%;" size="2">
     <div class="fileDiv">
@@ -122,7 +126,7 @@
 
 <ion-footer>
   <div class="centerDiv">
-    <ion-button class="confirmEitOkButton" color="customnavy" ion-button (click)="openSubmitModal()">
+    <ion-button class="confirmEitOkButton" [disabled] ="isAttachmentGET_MENU ==='Y' && attachListOver.length ===0" color="customnavy" ion-button (click)="openSubmitModal()">
       {{ 'general, submit' | translate }}</ion-button>
   </div>
 </ion-footer>
\ No newline at end of file
diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss
index b30d6c82..1017af8c 100644
--- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss
+++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss
@@ -106,170 +106,162 @@
     }
 
   }
-}
-
-
-
-
-
-
-.timeline {
-  position: relative;
-  margin: 15px 0 0 0;
-  //   border-bottom: solid 1px var(--cusgray);
-}
-
-.timeline:before {
-
-  content: '';
-  position: inherit !important;
-  top: 0;
-  bottom: 0;
-  width: 4px;
-  // background: #e4e4e4;
-  z-index: 1;
-  left: 35px;
-  /* margin-left: -10px; */
-  /* z-index: 1; */
-}
-
-.timeline .timeline-thumb {
-
-  border-radius: 500px;
-  width: 70px !important;
-  z-index: 2;
-  position: absolute;
-  left: 0px;
-  // :root[dir="ltr"]{
-  //    left: 37px;
-  // }
-  // :root[dir="rtl"]{
-  //     right: 37px;
-  // }
-  float: right;
-  top: 9px;
-}
-
-.timeline .timeline-thumb.timeline-icon {
-  height: 70px;
-  //   text-align: center;
-  //   color: white;
-  //   border: 5px solid #CBD0D3;
-  //   transform: scale(0.2);
-}
-
-
-
-.timeline .timeline-item {
-  width: 40px;
-
-}
-
-.timeline .timeline-stats {
-  position: relative;
-  font-size: 12px;
-  color: var(--darkgray);
-
-}
-
-.empImge {
-  border-radius: 50%;
-  width: 100%;
-  height: 100%;
-  border: #dedede solid 1px;
-
-}
-
-.empImgeRep {
-  border-radius: 50% !important;
-  width: 80px;
-  height: 80px;
-  border: #dedede solid 1px;
-}
-
-.line {
-  padding-bottom: 87px;
-}
-
-.attachLable {
-  position: absolute;
-  top: 0px;
-  z-index: 0;
-  background: #30b8c6;
-  color: #fff;
-  border-radius: 50%;
-  border: 0px;
-  width: 24px;
-  height: 24px;
-  text-align: center;
-  font-size: 5px;
-}
-
-.removeLable {
-  top: 0px;
-  z-index: 0;
-  background: #d8252d;
-  color: #fff;
-  border-radius: 50%;
-  border: 0px;
-  width: 20px;
-  height: 20px;
-  text-align: center;
-  font-size: 5px;
-}
-
-.note-modal {
-  // width: 90%;
-  // height: 50%;
-  // top: 20%;
-  // left: 5%;
-  // right: 5%;
-  // bottom: 5%;
-  background: rgba(0, 0, 0, 0.5) !important;
-  padding: 30% 10% !important;
-  --height: 12cm !important;
-  // --width: 80% !important;
-  --border-radius: 20px;
-
-}
-
-.header-toolbar-new {
-  --background: #BE332F;
-}
-
-.title {
-  margin-top: -37px;
-  margin-left: 85px;
-}
-
-.title-ar {
-  margin-top: -37px;
-  margin-right: 101px;
-}
-
-.confirmEitOkButton {
-  white-space: normal !important;
-  text-transform: capitalize !important;
-  min-height: 45px !important;
-  min-width: 5px !important;
-  margin: 8px !important;
-  background-color: #BE332F;
-  width: 80% !important;
-  color: white !important;
-  border-radius: 16px !important;
-  --border-radius: 16px !important;
-  --box-shadow: none;
-}
-
-.approvalTitle-ar {
-  font-weight: bold;
-  font-size: 16px;
-  text-align: right;
-
-}
-
-.approvalTitle {
-  font-weight: bold;
-  font-size: 16px;
-  text-align: left;
-}
\ No newline at end of file
+  
+  
+  
+  
+  
+  
+  .timeline {
+      position: relative;
+      margin: 15px 0 0 0;
+    //   border-bottom: solid 1px var(--cusgray);
+  }
+  
+  .timeline:before {
+   
+    content: '';
+    position: inherit !important;
+    top: 0;
+    bottom: 0;
+    width: 4px;
+    // background: #e4e4e4;
+    z-index: 1;
+    left: 35px;
+    /* margin-left: -10px; */
+    /* z-index: 1; */
+  }
+  
+  .timeline .timeline-thumb {
+   
+    border-radius: 500px;
+    width: 70px !important;
+    z-index: 2;
+    position: absolute;
+    left: 0px;
+    // :root[dir="ltr"]{
+    //    left: 37px;
+    // }
+    // :root[dir="rtl"]{
+    //     right: 37px;
+    // }
+    float: right;
+    top: 9px;
+  }
+  
+  .timeline .timeline-thumb.timeline-icon {
+      height: 70px;
+    //   text-align: center;
+    //   color: white;
+    //   border: 5px solid #CBD0D3;
+    //   transform: scale(0.2);
+  }
+  
+  
+  
+  .timeline .timeline-item {
+    width: 40px;
+  
+  }
+  
+  .timeline .timeline-stats {
+      position: relative;
+      font-size: 12px;
+      color: var(--darkgray);
+    
+  }
+  
+  .empImge{
+    border-radius: 50%;
+    width:100%;
+    height: 100%;
+    border: #dedede solid 1px;
+  
+  }
+  .empImgeRep {
+    border-radius: 50% !important;
+    width: 80px;
+    height: 80px;
+    border: #dedede solid 1px;
+  }
+  
+  .line{
+    padding-bottom:87px;
+  }
+  
+  .attachLable{
+    position: absolute;
+      top: 0px;
+      z-index: 0;
+      background: #44A7A1;
+      color: #fff;
+      border-radius: 50%;
+      border: 0px;
+      width: 24px;
+      height: 24px;
+      text-align: center;
+      font-size: 5px;
+  }
+  
+  .removeLable{
+    top: 0px;
+    z-index: 0;
+    background: #d8252d;
+    color: #fff;
+    border-radius: 50%;
+    border: 0px;
+    width: 20px;
+    height: 20px;
+    text-align: center;
+    font-size: 5px;
+  }
+  
+  .note-modal {
+    // width: 90%;
+    // height: 50%;
+    // top: 20%;
+    // left: 5%;
+    // right: 5%;
+    // bottom: 5%;
+    background: rgba(0, 0, 0, 0.5) !important;
+    padding: 30% 10% !important;
+    --height: 12cm !important;
+    // --width: 80% !important;
+    --border-radius:20px;
+    
+  }
+  .header-toolbar-new{
+    --background: #024d71;
+  }
+  .title{
+    margin-top: -37px;
+    margin-left: 85px;
+  }
+  .title-ar{
+    margin-top: -37px;
+      margin-right: 101px;
+  }
+  .confirmEitOkButton{
+    white-space: normal !important;
+    text-transform: capitalize !important;
+    min-height: 45px !important;
+    min-width: 5px !important;
+    margin: 8px !important;
+    background-color: #0ca2de;
+    width: 80% !important;
+    color: white!important;
+    border-radius: 16px !important;
+  }
+  
+  .approvalTitle-ar{
+    font-weight: bold;
+    font-size: 16px;
+    text-align: right;
+  
+  }
+  .approvalTitle{
+    font-weight: bold;
+    font-size: 16px;
+    text-align: left;
+  }
+  
diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts
index 67113d42..05178b59 100644
--- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts
+++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts
@@ -64,6 +64,7 @@ export class ConfirmContactComponent implements OnInit {
   indexLastObj: any = 0;
   filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'];
   direction: string;
+  isAttachmentGET_MENU: string = 'N';
 
 
   constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService, public profileService: ProfileService) {
@@ -79,6 +80,7 @@ export class ConfirmContactComponent implements OnInit {
     this.basicRequest = this.cs.sharedService.getSharedData(BasicRequest.SHARED_DATA, false);
 
     this.selEmp = this.basicRequest.P_SELECTED_EMPLOYEE_NUMBER;
+    this.isAttachmentGET_MENU = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED;
 
     this.menuType = this.selMenu.List_Menu.MENU_TYPE;
     this.headerTitle = this.selMenu.GetMenuEntriesList.PROMPT;
@@ -437,4 +439,8 @@ export class ConfirmContactComponent implements OnInit {
     }
   }
 
+  showToolTip(toolTip: any) {
+    this.cs.yellowToast(toolTip);
+  }
+
 }
diff --git a/Mohem/src/app/profile/contact/contact.component.html b/Mohem/src/app/profile/contact/contact.component.html
index 304341b1..95b937ac 100644
--- a/Mohem/src/app/profile/contact/contact.component.html
+++ b/Mohem/src/app/profile/contact/contact.component.html
@@ -1,9 +1,11 @@
-<ion-content>
-  <div class="head-title">
+<app-generic-header
+  showBack="true"
+  [headerText]="'general,contact' | translate">
+</app-generic-header>
 
-    <app-generic-header showImage="false" showBack="true" [headerText]="'general,contact' | translate">
-    </app-generic-header>
-  </div>
+<ion-content>
+  <!-- <div class="head-title">
+  </div> -->
   <div class="header"></div>
   <div class="bottom"></div>
 <div class="container" id="containerDiv">
diff --git a/Mohem/src/app/profile/contact/contact.component.ts b/Mohem/src/app/profile/contact/contact.component.ts
index 5df72271..189358a3 100644
--- a/Mohem/src/app/profile/contact/contact.component.ts
+++ b/Mohem/src/app/profile/contact/contact.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, NgZone } from '@angular/core';
 import { AddEitResponse } from 'src/app/eit/models/add.eit.response';
 import { EitRequest } from 'src/app/eit/models/eit.request';
 import { CommonService } from 'src/app/hmg-common/services/common/common.service';
@@ -20,7 +20,7 @@ export class ConatactComponent implements OnInit {
   respID: any;
   selMenu: any;
   submitrequest: any;
-  constructor(public cs: CommonService, public ts: TranslatorService, public profileService: ProfileService,) {
+    constructor(public cs: CommonService, public ts: TranslatorService, public profileService: ProfileService, public ngzone: NgZone) {
     this.direction = TranslatorService.getCurrentLanguageName();
     this.selEmp = this.cs.sharedService.getSharedData(
       MenuResponse.SHARED_SEL_EMP,
@@ -40,10 +40,13 @@ export class ConatactComponent implements OnInit {
 
 
   ngOnInit() {
-    this.phoneNumbers = this.cs.sharedService.getSharedData(ProfileService.EMP_PHONE, false);
-    this.setIsUpdated();
-    this.direction = TranslatorService.getCurrentLanguageName();
-    this.getObjectValue();
+    this.ngzone.run(() => {
+      this.phoneNumbers = [];
+      this.phoneNumbers = this.cs.sharedService.getSharedData(ProfileService.EMP_PHONE, false);
+      this.setIsUpdated();
+      this.direction = TranslatorService.getCurrentLanguageName();
+      this.getObjectValue();  
+    })
   }
   setIsUpdated() {
     this.phoneNumbers.forEach(element => {
@@ -93,6 +96,14 @@ export class ConatactComponent implements OnInit {
   addNewRow() {
     this.phoneNumbers.push({ 'PHONE_NUMBER': '', 'PHONE_TYPE': '', 'ACTION': 'NEW_ROW', 'OBJECT_VERSION_NUMBER': null, 'PHONE_ID': null })
   }
+
+  ionViewDidLeave() {
+    this.phoneNumbers = this.phoneNumbers.filter(function( obj ) {
+      return obj.ACTION !== 'NEW_ROW';
+    });
+    this.cs.sharedService.setSharedData(this.phoneNumbers, ProfileService.EMP_PHONE);  
+    
+  }
   deleteRow(row) {
     row['DELETE_ROW'] = true;
     // this.phoneNumbers =
diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html
index 44d0fffb..08a64937 100644
--- a/Mohem/src/app/profile/home/home.component.html
+++ b/Mohem/src/app/profile/home/home.component.html
@@ -59,8 +59,8 @@
           </div>
         </ion-col>
          <!-- (click)="selectedSegment('family')"  -->
-        <ion-col [size]="3">
-          <div class="action-button col-button disabledButton">
+        <ion-col [size]="3" (click)="selectedSegment('family')">
+          <div class="action-button col-button">
             <img *ngIf="!familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family.svg">
             <img *ngIf="familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family-g.svg">
             <span class="btnTitle">{{ts.trPK('userProfile','family-members')}}</span>
@@ -70,7 +70,7 @@
     </div>
     <ion-grid [ngClass]="direction === 'ltr'? 'grid-card':'grid-card-ar' ">
       <div [ngClass]=" direction == 'ltr' ?  'gridService-en' : 'gridService-ar'"
-        style="background: #2B353E; border-radius: 0px 0px 10px 10px;">
+        style="background: #44A7A1; border-radius: 0px 0px 10px 10px;">
         <ion-row>
           <ion-col>
             <label
@@ -176,12 +176,13 @@
               <h1 [ngClass]="direction === 'ltr'? 'header-label-text-form': 'header-label-text-form-ar' ">{{ts.trPK('general','basic-details')}}</h1>
             </ion-label>
           </ion-col>
-
-          <ion-col size="2" *ngIf="basicDetailsSubMenu && basicDetailsSubMenu.UPDATE_BUTTON === 'Y'">
-            <img style="width: 18px;height: 18px;" src="../assets/imgs/profile-icons/editing@2x.png"
+          <!--  -->
+          <ion-col size="2" *ngIf="basicDetailsSubMenu && basicDetailsSubMenu.UPDATE_BUTTON === 'Y'" >
+            <img class="icon-img" src="../assets/imgs/profile-icons/editing@2x.png"
               (click)="allowEdit('basic')">
           </ion-col>
-          <ion-col size="2" *ngIf="basicDetailsSubMenu && basicDetailsSubMenu.ADD_BUTTON === 'Y'">
+          <!--  -->
+          <ion-col size="2"  *ngIf="basicDetailsSubMenu && basicDetailsSubMenu.ADD_BUTTON === 'Y'">
               <ion-icon class="add-icon-styling" name="add"></ion-icon>
           </ion-col>
         </ion-row>
@@ -213,16 +214,17 @@
   <ion-card *ngIf="contactSegment" [ngClass]="direction === 'ltr'? 'card-size-info-en': 'card-size-info-ar' ">
     <ion-card-content *ngIf="!editAddress && employeeAdress">
       <ion-grid>
-        <ion-row style="width: 113%;">
+        <ion-row>
           <ion-col size="10">
             <ion-label>
               <h1 [ngClass]="direction === 'ltr'? 'header-label-text-form': 'header-label-text-form-ar' ">{{ts.trPK('userProfile','phone-no')}}</h1>
             </ion-label>
           </ion-col>
-
-          <ion-col size="2" *ngIf="phoneSubMenu && phoneSubMenu.UPDATE_BUTTON === 'Y'" (click)="allowEdit('contact')">
-            <img style="width: 18px; height: 18px;" src="../assets/imgs/profile-icons/editing@2x.png">
+          <!--  -->
+          <ion-col size="2" *ngIf="phoneSubMenu && phoneSubMenu.UPDATE_BUTTON === 'Y'"  (click)="allowEdit('contact')">
+            <img class="icon-img" src="../assets/imgs/profile-icons/editing@2x.png">
           </ion-col>
+          <!--  -->
           <ion-col size="2" *ngIf="phoneSubMenu && phoneSubMenu.ADD_BUTTON === 'Y'" (click)="allowEdit('contact')">
             <ion-icon class="add-icon-styling" name="add"></ion-icon>
         </ion-col>
@@ -249,16 +251,17 @@
   <ion-card *ngIf="addressSegment" [ngClass]="direction === 'ltr'? 'card-size-info-en': 'card-size-info-ar' ">
     <ion-card-content *ngIf="!editAddress && employeeAdress">
       <ion-grid>
-        <ion-row style="width: 113%;">
+        <ion-row>
           <ion-col size="10">
             <ion-label>
               <h1 [ngClass]="direction === 'ltr'? 'header-label-text-form': 'header-label-text-form-ar' ">{{ts.trPK('general','main-address')}}</h1>
             </ion-label>
           </ion-col>
-
+          <!--  -->
           <ion-col size="2" *ngIf="addressSubMenu && addressSubMenu.UPDATE_BUTTON === 'Y'" (click)="allowEdit('address')">
-            <img style="width: 18px; height: 18px;" src="../assets/imgs/profile-icons/editing@2x.png">
+            <img class="icon-img" src="../assets/imgs/profile-icons/editing@2x.png">
           </ion-col>
+          <!--  -->
           <ion-col size="2" *ngIf="addressSubMenu && addressSubMenu.ADD_BUTTON === 'Y'" (click)="allowEdit('address')">
             <ion-icon class="add-icon-styling" name="add"></ion-icon>
         </ion-col>
@@ -351,7 +354,7 @@
             <h2 style="font-weight: bold; font-size: 15px;margin:0">{{data.CONTACT_NAME}}</h2>
           </ion-col>
           <ion-col [size]='direction === "ltr" ? 5 : 8 ' [offset]='direction === "ltr" ? 3 : 0 ' [ngClass]="dependentDetails  && dependentDetails.UPDATE_BUTTON === 'Y' ? '' :'disabledButton'"> 
-            <div class='family-member-button' style="height: 32px !important;" (click)='updateFunction(data)'>
+            <div [ngClass]="direction === 'ltr' ? 'float-right-moe' :'float-left-moe'" class='family-member-button' style="height: 32px !important;" (click)='updateFunction(data)'>
                 <ion-icon style="width: 20px;" name="create"></ion-icon>
                 <p>{{ts.trPK('userProfile','update')}}</p>
             </div>
@@ -362,7 +365,7 @@
             <ion-label><p style="font-weight: bold; font-size: 14px;">{{data.RELATIONSHIP}}</p></ion-label>
           </ion-col>
           <ion-col  [size]='direction === "ltr" ? 5 : 8 ' [offset]='direction === "ltr" ? 3 : 0 '>
-            <div class='family-member-button' style="height: 32px !important;" (click)='RemoveFunction(data)' [ngClass]="dependentDetails  && dependentDetails.DELETE_BUTTON === 'Y' ? '' :'disabledButton'">
+            <div [ngClass]="direction === 'ltr' ? 'float-right-moe' :'float-left-moe'" class='family-member-button' style="height: 32px !important;" (click)='RemoveFunction(data)' [ngClass]="dependentDetails  && dependentDetails.DELETE_BUTTON === 'Y' ? '' :'disabledButton'">
                 <ion-icon name="trash" style="width: 20px; height: 20px; color: #CA3332;"></ion-icon>
                 <p style="color: #CA3332;">{{ts.trPK('userProfile','remove')}}</p>
             </div>
diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss
index 10ac8f95..542290ba 100644
--- a/Mohem/src/app/profile/home/home.component.scss
+++ b/Mohem/src/app/profile/home/home.component.scss
@@ -1166,6 +1166,21 @@ $actionBtnSize: 36px;
   }
 }
 
+@media screen and (min-width: 1060px) and (max-width:1090px) {
+  .changeImgBtn {
+    position: absolute;
+    background: #f0ecec;
+    min-height: 25px;
+    width: 24px !important;
+    height: 20px;
+    border-radius: 50%;
+    bottom: 55px;
+    right: 41%;
+    top: -10%;
+    z-index: 99;
+  }
+}
+
 @media screen and (min-width: 1px) and (max-width:766px) {
   .changeImgBtn-ar {
     position: absolute;
@@ -1251,14 +1266,20 @@ $actionBtnSize: 36px;
 }
 
 .card-size-info-en {
+  // width: 88%;
+  // left: 2%;
+  // width: 89%;
+  //   left: 10px;
   width: 90%;
+  left: 5%;
   padding-left: 0px;
-  margin-right: 0px;
-  margin-left: 20px;
+  margin-left: 0px;
 }
 
 .card-size-info-ar {
   width: 90%;
+  right: 1%;
+  padding-right: 0px;
   margin-left: 0px;
   margin-right: 20px;
 }
@@ -1302,37 +1323,39 @@ $actionBtnSize: 36px;
   color: white;
   border-radius: 50%;
   position: absolute;
-  right: 30px;
+  left: 20px;
+  right: 20px;
 }
 
 .name {
   text-align: center;
   letter-spacing: -0.84px;
-  color: #2B353E;
+  color: #004D71;
   opacity: 1;
-  font-family: var(--fontFamilyPoppins-SemiBold, inherit);
+  font-weight: bold;
   line-height: 21px;
   font-size: 21px;
 }
 
 .email {
   text-align: center;
-  font-family: var(--fontFamilyPoppins-SemiBold, inherit);
+  margin: 10px;
   font-size: 13px;
   line-height: 6px;
   letter-spacing: -0.52px;
-  color: #A2A2A2;
+  color: #004D71;
   opacity: 1;
+  font-family: 'Inter' !important;
 }
 
 
 .subTitle {
   text-align: center;
   letter-spacing: -0.52px;
-  color: #A2A2A2;
+  color: #004D71;
   opacity: 1;
-  font-family: var(--fontFamilyPoppins-SemiBold, inherit);
-  font-size: 13px;
+  font-weight: bold;
+  font-size: 16px;
   line-height: 0px;
   margin-bottom: 7px;
 }
@@ -1341,19 +1364,21 @@ $actionBtnSize: 36px;
 .boldText {
   text-align: center;
   letter-spacing: -0.64px;
-  color: #2B353E;
+  color: #5C6F79 !important;
   opacity: 1;
-  font-family: var(--fontFamilyPoppins-SemiBold, inherit);
-  font-size: 16px;
+  font-family: 'Inter' !important;
+  font-size: 14px;
   line-height: 19px;
+  top: 5px;
+  position: relative;
 }
 
 .btnTitle {
   text-align: center;
-  font-family: var(--fontFamilyPoppins-SemiBold, inherit);
-  line-height: 10px;
+  line-height: 12px;
   font-size: 11px;
   color: #4D4D4D;
+  margin-top: 5px;
 }
 
 .Profileheader-label-text-form {
@@ -1362,7 +1387,8 @@ $actionBtnSize: 36px;
   line-height: 30px;
   font-size: 20px;
   letter-spacing: -0.8px;
-  color: #2B353E;
+  color: #004D71;
+  font-weight: bold;
   opacity: 1;
   margin-top: 12px;
   margin-bottom: 2px;
@@ -1374,7 +1400,8 @@ $actionBtnSize: 36px;
   line-height: 30px;
   font-size: 20px;
   letter-spacing: -0.8px;
-  color: #2B353E;
+  color: #004D71;
+  font-weight: bold;
   opacity: 1;
   margin-top: -3px;
   margin-bottom: 2px;
@@ -1388,7 +1415,8 @@ $actionBtnSize: 36px;
   line-height: 20px;
   font-size: 13px;
   letter-spacing: -0.52px;
-  color: #A2A2A2;
+  color: #5C6F79;
+  font-weight: bold;
   opacity: 1;
 }
 
@@ -1398,7 +1426,8 @@ $actionBtnSize: 36px;
   line-height: 20px;
   font-size: 16px;
   letter-spacing: -0.64px;
-  color: #2B353E;
+  color: #004D71;
+  font-weight: bold;
   opacity: 1;
 }
 
@@ -1409,7 +1438,8 @@ $actionBtnSize: 36px;
   line-height: 30px;
   font-size: 20px;
   letter-spacing: -0.8px;
-  color: #2B353E;
+  color: #004D71;
+  font-weight: bold;
   opacity: 1;
   margin-top: 12px;
   margin-bottom: 2px;
@@ -1417,11 +1447,12 @@ $actionBtnSize: 36px;
 
 .header-label-text-form-ar {
   text-align: right;
-  font-family: var(--fontFamilyPoppins-SemiBold, inherit);
+  font-weight: bold;
   line-height: 30px;
   font-size: 20px;
   letter-spacing: -0.8px;
-  color: #2B353E;
+  color: #004D71;
+  font-weight: bold;
   opacity: 1;
   margin-top: -3px;
   margin-bottom: 2px;
@@ -1435,18 +1466,22 @@ $actionBtnSize: 36px;
   line-height: 20px;
   font-size: 13px;
   letter-spacing: -0.52px;
-  color: #A2A2A2;
+  color: #5C6F79;
+  font-weight: bold;
   opacity: 1;
 }
 
 .result-label-text-form-ar {
   text-align: right;
-  font-family: var(--fontFamilyPoppins-SemiBold, inherit);
   line-height: 20px;
   font-size: 16px;
   letter-spacing: -0.64px;
-  color: #2B353E;
+  color: #004D71;
+  font-weight: bold;
   opacity: 1;
+  font-family: 'Inter' !important;
+  margin-top: 3px;
+  font-weight: bold;
 }
 
 .create-edit {
@@ -1507,4 +1542,12 @@ $actionBtnSize: 36px;
 .disabledButton {
   opacity: .5;
   pointer-events: none;
+}
+
+.icon-img {
+  width: 20px;
+  height: 20px;
+  position: relative;
+  left: 20px;
+  right: 20px;
 }
\ No newline at end of file
diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts
index 1a384217..a1689ba3 100644
--- a/Mohem/src/app/profile/home/home.component.ts
+++ b/Mohem/src/app/profile/home/home.component.ts
@@ -167,10 +167,10 @@ export class HomeComponent implements OnInit {
           this.personalInfo = user;
           this.getPhoneNumbers();
           this.getContactInfo();
-          let jobTitle = user.POSITION_NAME.split('.');
-          if (jobTitle && jobTitle.length > 1) {
-            this.jobName = jobTitle[0] + " " + jobTitle[1];
-          }
+          let jobTitle = user.POSITION_NAME;
+          // if (jobTitle && jobTitle.length > 1) {
+            this.jobName = jobTitle;
+          // }
 
           if (this.cs.getUpdateImage().status) {
             this.user_image = this.sanitizer.bypassSecurityTrustUrl('data:image/png;base64,' + this.cs.getUpdateImage().img);
@@ -396,7 +396,6 @@ export class HomeComponent implements OnInit {
       if (this.cs.validResponse(response)) {
         this.cs.stopLoading();
         this.phoneNumbers = response['GetEmployeePhonesList'];
-        console.log(this.phoneNumbers);
         this.cs.sharedService.setSharedData(this.phoneNumbers, ProfileService.EMP_PHONE);
       }
     })
diff --git a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html
index 203320cc..937d8896 100644
--- a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html
+++ b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html
@@ -15,7 +15,7 @@
         <ion-radio slot="start" color="secondary" mode='md' value="1"></ion-radio>
       </ion-item>
 
-      <ion-item lines="none">
+      <ion-item lines="none" style="pointer-events: none;opacity: .3;">
         <ion-label>
           <h3 *ngIf="sourceName === 'basicDetails'" style="color: black; font-size: 20px; white-space: break-spaces !important">{{ts.trPK('general','new-info')}}</h3>
           <h3 *ngIf="sourceName === 'address'" style="color: black; font-size: 20px; white-space: break-spaces !important">{{ts.trPK('general','new-info-address')}}</h3>
diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html
index 716539d2..a9af9afe 100644
--- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html
+++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html
@@ -5,63 +5,40 @@
 
 <ion-content class="colorBG">
   <div class="header-div">
-    <!-- <ion-buttons slot="start">
-      <ion-back-button color="light" class="btnBack" defaultHref="/home"></ion-back-button>
-    </ion-buttons>
-    <p class="proTitles">{{ts.trPK('userProfile','performance')}}</p> -->
-
-    <div class="profilediv">
-        <!-- <img class="profileImg" [src]="user_image"> -->
-       </div>
-    <!-- <ion-img class="profileImg" [src]="imageSrc"></ion-img> -->
-
-
-
-    <ion-grid>
-      <div class="grid">
-        <ion-row>
-          <p [ngClass]=" direction == 'ltr' ?  'Text' : 'Text-ar'">{{ts.trPK('userProfile','performance-evaluation')}}</p>
-
-          <div [ngClass]=" direction == 'ltr' ?  'gauge' : 'gauge-ar'" >
-
-            <!-- [showText]="showText" -->
-            <ngx-charts-gauge  [view]="view" [scheme]="colorScheme" [results]="performanceData" [min]="0" [max]="100"
-              [angleSpan]="240" [startAngle]="-120" [bigSegments]="5"
-              [smallSegments]="10">
-            </ngx-charts-gauge>
-
-
-
+        <ion-grid>
+          <div class="grid">
+            <ion-row>
+              <p [ngClass]=" direction == 'ltr' ?  'Text' : 'Text-ar'">{{ts.trPK('userProfile','performance-evaluation')}}</p>
+              
+              <div class="gauge"  *ngIf="performanceData.length >0">
+                <ngx-charts-gauge
+                
+                  [scheme]="colorScheme"
+                  [results]="performanceData"
+                  min="0"
+                  max="5">
+                </ngx-charts-gauge>
+              </div>
+            </ion-row>
           </div>
 
-        </ion-row>
-      </div>
-
-
-    <div>
-      <div *ngIf="performanceData">
-        <div    >
-      <ion-row  >
-          <ion-col  *ngFor="let data of performanceData ;let i = index"  [ngClass]="length % 2 != 0  && i == length - 1 ?  'rightgrid' : 'leftgrid'" >
-            <div class="performancecolor" [style.background]="data.color"></div>
-            <br>
-            <label [ngClass]=" direction == 'ltr' ?  'label' : 'label-ar'"> {{ts.trPK('userProfile','your-performance')}} </label>
-            <label [ngClass]=" direction == 'ltr' ?  'label' : 'label-ar'"> {{data.name}} </label>
-            <br>
-            <label [ngClass]=" direction == 'ltr' ?  'labelvalue' : 'labelvalue-ar'"> {{data.value}} </label>
-            <label [ngClass]=" direction == 'ltr' ?  'percentage' : 'percentage-ar'"> %</label>
-          </ion-col>
-      </ion-row>
+        <div *ngIf="performanceData">
+            <ion-row  >
+                <ion-col  *ngFor="let data of performanceData ;let i = index"  [ngClass]="length % 2 != 0  && i == length - 1 ?  'rightgrid' : 'leftgrid'" >
+                  <div class="performancecolor" style="background: #44a7a1;"></div>
+                  <br>
+                  <label [ngClass]=" direction == 'ltr' ?  'label' : 'label-ar'"> {{ts.trPK('userProfile','your-performance')}} </label>
+                  <label [ngClass]=" direction == 'ltr' ?  'label' : 'label-ar'"> {{data.name}} </label>
+                  <br>
+                  <label *ngIf="data.value == 0" [ngClass]=" direction == 'ltr' ?  'labelvalue' : 'labelvalue-ar'"> - </label>
+                  <label *ngIf="data.value > 0" [ngClass]=" direction == 'ltr' ?  'labelvalue' : 'labelvalue-ar'"> {{data.value}} </label>
+                  <label [ngClass]=" direction == 'ltr' ?  'percentage' : 'percentage-ar'"></label>
+                </ion-col>
+            </ion-row>
         </div>
+        </ion-grid>
     </div>
-    </div>
-
-
-
-    </ion-grid>
-
-  </div>
+</ion-content>
 
 
 
-</ion-content>
\ No newline at end of file
diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
index ae632df7..19f43c90 100644
--- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
+++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
@@ -183,4 +183,4 @@
   margin-bottom: -187px;
   margin-top: -20px;
   margin-right: -56px;
-}
\ No newline at end of file
+}
diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts
index 91f49925..e683c192 100644
--- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts
+++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts
@@ -20,7 +20,7 @@ export class PerformanceEvaluationComponent implements OnInit {
   personalInfo: any;
   user_image: any = '../assets/imgs/profile.png';
   setImage: any;
-  view: any = [380, 450];
+
   public performanceData: any = [];
   public length;
   public direction: string;
@@ -73,9 +73,10 @@ export class PerformanceEvaluationComponent implements OnInit {
 
   }
 
-  ngAfterViewInit() {
-    document.querySelector('svg .gauge.chart > text').remove();
-  }
+  // ngAfterViewInit() {
+  //   if(this.performanceData.length)
+  //   document.querySelector('svg .gauge.chart > text').remove();
+  // }
 
   getProfile() {
     console.log('getProfile');
@@ -107,14 +108,21 @@ export class PerformanceEvaluationComponent implements OnInit {
         this.appraisalArr = result.GetPerformanceAppraisalList;
         this.performanceData = [];
         for (let i = 0; i < this.appraisalArr.length; i++) {
-          this.performanceData.push({ name: this.appraisalArr[i].APPRAISAL_YEAR, value: parseInt(this.appraisalArr[i].APPRAISAL_SCORE).toFixed() });
+          if (!this.appraisalArr[i].APPRAISAL_SCORE) {
+            this.appraisalArr[i].APPRAISAL_SCORE = 0;
+          }
+          this.performanceData.push({ name: this.appraisalArr[i].APPRAISAL_YEAR, value: parseFloat(this.appraisalArr[i].APPRAISAL_SCORE)});
         }
-        console.log('PerformanceAppraisalResponse');
         this.cs.sharedService.setSharedData(this.performanceData, PerformanceAppraisalResponse.PERFORMANCE_DATA);
-        this.cs.openPerformanceevaluation();
+       setTimeout(()=>{
+        document.querySelector('svg .gauge.chart > text').remove();
+       },100)
+        // this.cs.openPerformanceevaluation();
       } else {
         let msg: string = this.ts.trPK("userProfile", "no-appraisal");
-        this.cs.presentAlert(msg);
+        this.cs.presentAlert(msg, ()=>{
+          this.cs.back();
+        });
       }
     }
   }
diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.scss b/Mohem/src/app/profile/profile-image/profile-image.component.scss
index 2ae1509d..3116e0ac 100644
--- a/Mohem/src/app/profile/profile-image/profile-image.component.scss
+++ b/Mohem/src/app/profile/profile-image/profile-image.component.scss
@@ -52,4 +52,4 @@
 
 .header-toolbar-new {
     --background: #BE332F;
-}
\ No newline at end of file
+}
diff --git a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.html b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.html
index 75fc66f0..5963fb78 100644
--- a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.html
+++ b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.html
@@ -8,7 +8,7 @@
   <div class="bottom"></div>
 
   <div class="main-container">
-  <ion-item>
+  <ion-item *ngIf="fromHome == 'false'">
     <ion-label>{{ 'worklist,template-name' | translate}}</ion-label>
   <ion-select  [(ngModel)]="template" (ionChange)="selectTemplates()" [placeholder]="'general,select' | translate"
     [okText]="'general,ok' | translate" [cancelText]="'general,cancel' | translate" class="concorrent-select large-ion-select">
@@ -16,6 +16,13 @@
       {{ program.USER_CONCURRENT_PROGRAM_NAME}}</ion-select-option></ion-select>
 
 </ion-item>
+
+<ion-item *ngIf="fromHome == 'true'" style="pointer-events: none; opacity: .6;">
+  <ion-label>{{ 'worklist,template-name' | translate}}</ion-label>
+<ion-select [placeholder]="'general,select' | translate" class="concorrent-select large-ion-select">
+  <ion-select-option selected value="selectedMenu.PROMPT">
+    {{ selectedMenu.PROMPT}}</ion-select-option></ion-select>
+</ion-item>
 <div class="divider"></div>
   <div #containerDiv id="containerDiv">
   </div>
diff --git a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts
index 85715324..ac10c0d4 100644
--- a/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts
+++ b/Mohem/src/app/reports/concurrent-report/concurrent-report.component.ts
@@ -15,6 +15,7 @@ import { TextInput } from 'src/app/uI-elements/text.input';
 import { TimeInput } from 'src/app/uI-elements/time.input';
 import { ReportServiceService } from '../report-service.service';
 import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/models/authenticated-user";
+import { ActivatedRoute } from '@angular/router';
 
 @Component({
   selector: 'app-concurrent-report',
@@ -40,10 +41,11 @@ export class ConcurrentReportComponent implements OnInit {
   public selEmp;
   public eitRequest;
   public ExtraObj;
-
   selMenu: MenuResponse;
   public functionName;
   public userData: any;
+  public fromHome: any = false;
+
 
 
   public headerTitle;
@@ -54,16 +56,26 @@ export class ConcurrentReportComponent implements OnInit {
   comtransNo: any = 1;
   programList: any = [];
   public template: any;
-  constructor(public cs: CommonService, private elementRef: ElementRef, public reports: ReportServiceService, public ts: TranslatorService, public eitService: EitService) { }
+  constructor(public cs: CommonService, private elementRef: ElementRef, public reports: ReportServiceService, public ts: TranslatorService, public eitService: EitService, public router: ActivatedRoute) {
+    this.router.queryParams.subscribe(params => {
+      console.log(params)
+      this.fromHome = params.fromHome;
+    });
+   }
 
   ngOnInit() {
     this.userData =this.cs.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA,false);
     this.getPassdirfromNotifiPage = this.cs.sharedService.getSharedData('dirfromNotificationPage');
     this.selectedMenu = this.cs.sharedService.getSharedData(MenuResponse.SELECTED_MENU, false);
-    this.getConcurrentProgram();
+    this.functionName = this.selectedMenu.FUNCTION_NAME;
+
+    if (this.fromHome == "false") {
+      this.getConcurrentProgram();
+    } else {
+      this.getCppDiffStructure(this.functionName);
+    }
     this.direction = TranslatorService.getCurrentLanguageName();
     // this.effectiveDate = new Date();
-    this.functionName = this.selectedMenu.FUNCTION_NAME;
     // this.headerTitle = this.selMenu.GetMenuEntriesList.PROMPT;
   }
   getConcurrentProgram() {
@@ -80,7 +92,7 @@ export class ConcurrentReportComponent implements OnInit {
   getCppDiffStructure(programList) {
     this.cs.startLoading();
     this.reports.getCPPDiffStructure({
-      P_DESC_FLEX_NAME: programList.CONCURRENT_PROGRAM_NAME,
+      P_DESC_FLEX_NAME: this.fromHome == "false" ? programList.CONCURRENT_PROGRAM_NAME : programList,
       P_SELECTED_EMPLOYEE_NUMBER: this.userData.EMPLOYEE_NUMBER
     }, () => { }, this.ts.trPK('general', 'retry')).subscribe((response) => {
       this.cs.stopLoading();
@@ -123,7 +135,8 @@ export class ConcurrentReportComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else if (feildsList[i].FORMAT_TYPE == "N") {
             // number
@@ -134,7 +147,8 @@ export class ConcurrentReportComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else if (feildsList[i].FORMAT_TYPE == "X") {
             // standard date
@@ -153,7 +167,8 @@ export class ConcurrentReportComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.dateInput = new DateInput(
@@ -164,7 +179,8 @@ export class ConcurrentReportComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
           } else if (feildsList[i].FORMAT_TYPE == "Y") {
@@ -183,7 +199,8 @@ export class ConcurrentReportComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.datetimeInput = new DateTimeInput(
@@ -194,7 +211,8 @@ export class ConcurrentReportComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
             const elem = document.getElementById(
@@ -216,7 +234,8 @@ export class ConcurrentReportComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.timeInput = new TimeInput(
@@ -227,7 +246,8 @@ export class ConcurrentReportComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
           }
@@ -241,7 +261,8 @@ export class ConcurrentReportComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else {
             this.selectInput = new SelectInput(
@@ -251,7 +272,8 @@ export class ConcurrentReportComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
             this.fillDropdownList(
               feildsList[i].SEGMENT_NAME,
@@ -932,8 +954,8 @@ export class ConcurrentReportComponent implements OnInit {
     this.eitRequest.P_SELECTED_EMPLOYEE_NUMBER = this.userData.EMPLOYEE_NUMBER;
     this.eitRequest.P_MENU_TYPE = this.selectedMenu.MENU_TYPE;
     this.eitRequest.P_SELECTED_RESP_ID = -999;// this.selectedMenu.RESP_ID; // this.selMenu.List_Menu.RESP_ID,//-999,
-    this.eitRequest.P_FUNCTION_NAME = this.functionName;
-    this.eitRequest.P_DESC_FLEX_NAME = this.template.CONCURRENT_PROGRAM_NAME;
+    // this.eitRequest.P_FUNCTION_NAME = this.functionName;
+    this.eitRequest.P_DESC_FLEX_NAME = this.fromHome == "false" ? this.template.CONCURRENT_PROGRAM_NAME: this.functionName;
     // this.reportSubmitRequest = {}
     this.cs.startLoading();
     this.reports
@@ -961,7 +983,7 @@ export class ConcurrentReportComponent implements OnInit {
     request.P_MENU_TYPE = this.selectedMenu.MENU_TYPE;
     request.P_SELECTED_RESP_ID = -999;
     request.P_FUNCTION_NAME = this.functionName;
-    request.P_DESC_FLEX_NAME = this.template.CONCURRENT_PROGRAM_NAME;
+    request.P_DESC_FLEX_NAME = this.fromHome == "false" ? this.template.CONCURRENT_PROGRAM_NAME: this.functionName;
     request.P_SELECTED_EMPLOYEE_NUMBER = this.userData.EMPLOYEE_NUMBER;
 
 
diff --git a/Mohem/src/app/reports/transaction-list/transaction-list.component.ts b/Mohem/src/app/reports/transaction-list/transaction-list.component.ts
index 957f0b58..9f23766a 100644
--- a/Mohem/src/app/reports/transaction-list/transaction-list.component.ts
+++ b/Mohem/src/app/reports/transaction-list/transaction-list.component.ts
@@ -98,7 +98,7 @@ export class TransactionListComponent implements OnInit {
     request.P_MENU_TYPE = this.selectedMenu.MENU_TYPE;
     request.P_SELECTED_RESP_ID = -999;
     request.P_FUNCTION_NAME = this.selectedMenu.FUNCTION_NAME;
-    request.P_DESC_FLEX_NAME = this.template.CONCURRENT_PROGRAM_NAME;
+    request.P_DESC_FLEX_NAME = this.template != undefined ? this.template.CONCURRENT_PROGRAM_NAME: this.selectedMenu.FUNCTION_NAME;
     request.P_SELECTED_EMPLOYEE_NUMBER = this.userData.EMPLOYEE_NUMBER;
 
     this.reports.getTransaction(request, {}, this.ts.trPK('general', 'retry')).subscribe((result: any) => {
diff --git a/Mohem/src/app/reports/transactions/transactions.component.ts b/Mohem/src/app/reports/transactions/transactions.component.ts
index 42bb0d87..38cea1ee 100644
--- a/Mohem/src/app/reports/transactions/transactions.component.ts
+++ b/Mohem/src/app/reports/transactions/transactions.component.ts
@@ -130,6 +130,6 @@ export class TransactionsComponent implements OnInit {
     }
   }
   createTransaction() {
-    this.cs.openConcurrentReport();
+    this.cs.openConcurrentReport(false);
   }
 }
diff --git a/Mohem/src/app/termination/termination-form/termination-form.component.ts b/Mohem/src/app/termination/termination-form/termination-form.component.ts
index a874077e..4d348f2f 100644
--- a/Mohem/src/app/termination/termination-form/termination-form.component.ts
+++ b/Mohem/src/app/termination/termination-form/termination-form.component.ts
@@ -129,7 +129,8 @@ export class TerminationFormComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else if (feildsList[i].FORMAT_TYPE == "N") {
             // number
@@ -140,7 +141,8 @@ export class TerminationFormComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else if (feildsList[i].FORMAT_TYPE == "X") {
             // standard date
@@ -159,7 +161,8 @@ export class TerminationFormComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.dateInput = new DateInput(
@@ -170,7 +173,8 @@ export class TerminationFormComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
           } else if (feildsList[i].FORMAT_TYPE == "Y") {
@@ -189,7 +193,8 @@ export class TerminationFormComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.datetimeInput = new DateTimeInput(
@@ -200,7 +205,8 @@ export class TerminationFormComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
             const elem = document.getElementById(
@@ -222,7 +228,8 @@ export class TerminationFormComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             } else {
               this.timeInput = new TimeInput(
@@ -233,7 +240,8 @@ export class TerminationFormComponent implements OnInit {
                 feildsList[i].MOBILE_ENABLED,
                 feildsList[i].DISPLAY_FLAG,
                 feildsList[i].REQUIRED_FLAG,
-                this.direction
+                this.direction,
+                feildsList[i].REQ_COL_TIP
               );
             }
           }
@@ -247,7 +255,8 @@ export class TerminationFormComponent implements OnInit {
               defaultValText,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
           } else {
             this.selectInput = new SelectInput(
@@ -257,7 +266,8 @@ export class TerminationFormComponent implements OnInit {
               containerId,
               feildsList[i].MOBILE_ENABLED,
               feildsList[i].DISPLAY_FLAG,
-              feildsList[i].REQUIRED_FLAG
+              feildsList[i].REQUIRED_FLAG,
+              feildsList[i].REQ_COL_TIP
             );
             this.fillDropdownList(
               feildsList[i].SEGMENT_NAME,
@@ -1288,7 +1298,8 @@ export class TerminationFormComponent implements OnInit {
             defaultValText,
             feildsList[i].MOBILE_ENABLED,
             feildsList[i].DISPLAY_FLAG,
-            feildsList[i].REQUIRED_FLAG
+            feildsList[i].REQUIRED_FLAG,
+            feildsList[i].REQ_COL_TIP
           );
         } else if (feildsList[i].DATATYPE == "VARCHAR2" && feildsList[i].ObjectValuesList !== null) {
           this.selectInput = new SelectInput(
@@ -1298,7 +1309,8 @@ export class TerminationFormComponent implements OnInit {
             containerId,
             feildsList[i].MOBILE_ENABLED,
             feildsList[i].DISPLAY_FLAG,
-            feildsList[i].REQUIRED_FLAG
+            feildsList[i].REQUIRED_FLAG,
+            feildsList[i].REQ_COL_TIP
           );
           this.fillStaticDropdownList(
             feildsList[i].SEGMENT_NAME,
@@ -1313,7 +1325,8 @@ export class TerminationFormComponent implements OnInit {
             containerId,
             feildsList[i].MOBILE_ENABLED,
             feildsList[i].DISPLAY_FLAG,
-            feildsList[i].REQUIRED_FLAG
+            feildsList[i].REQUIRED_FLAG,
+            feildsList[i].REQ_COL_TIP
           );
         } else if (feildsList[i].DATATYPE == "DATE") {
           this.dateInput = new DateInput(
@@ -1324,7 +1337,8 @@ export class TerminationFormComponent implements OnInit {
             feildsList[i].MOBILE_ENABLED,
             feildsList[i].DISPLAY_FLAG,
             feildsList[i].REQUIRED_FLAG,
-            this.direction
+            this.direction,
+            feildsList[i].REQ_COL_TIP
           );
 
         }
diff --git a/Mohem/src/app/uI-elements/date-time.input.ts b/Mohem/src/app/uI-elements/date-time.input.ts
index 05e63bad..dd467f8d 100644
--- a/Mohem/src/app/uI-elements/date-time.input.ts
+++ b/Mohem/src/app/uI-elements/date-time.input.ts
@@ -9,7 +9,8 @@ export class DateTimeInput extends UiElement {
         private disabled: string,
         private hidden: string,
         private required: string,
-        private language: string = 'en') {
+        private language: string = 'en',
+        private toolTipText: string) {
         super(elementId, containerId, '');
         this.createElement(this.getTemplate());
 
@@ -21,6 +22,7 @@ export class DateTimeInput extends UiElement {
     }
     public getTemplate() {
         let requiredClass: string = "";
+        let hideToolTipClass: string = "";
         const doneText = this.language === 'en' ? 'Done' : 'تم';
         const cancelText = this.language === 'en' ? 'Cancel' : 'إلغاء';
         let disaledClass = "";
@@ -33,6 +35,9 @@ export class DateTimeInput extends UiElement {
         }
         if (this.required == 'Y')
             requiredClass = "requiredClass"
+        
+        if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"}
+        
         // let arrayDate=val.split(" ");
         //       elem.value = this.common.reverseFormatDate(arrayDate[0]);
         //       elem.setAttribute('value', elem.value);
@@ -45,13 +50,14 @@ export class DateTimeInput extends UiElement {
         //     timeValue=arrayDate[1];
         // }
         const template =
-            "<ion-item class='dynamicField'>" +
+            "<ion-item class='dynamicField ion-item-position'>" +
             " <ion-label position='floating' style='font-size: medium !important;' class='daynamicForm-Label " + requiredClass + "' id='title' >" + this.label + "</ion-label>" +
             // " <div class='daynamicForm-DateTime " + disaledClass + "'  id='" + this.elementId + "' data-dtvalue='" + this.value + "' " + this.disabled + ">" + this.value + "</div>" +
-            "<ion-datetime min='1900' max='2100' displayFormat='DD/MM/YYYY' value='" + this.value + "' done-text='" + doneText + "' cancel-text='" + cancelText + "' id='" + this.elementId + "' data-dtvalue='" + this.value + "' " + this.disabled + "></ion-datetime>" +
+            "<ion-datetime style='width: 85%;' min='1900' max='2100' displayFormat='DD/MM/YYYY' value='" + this.value + "' done-text='" + doneText + "' cancel-text='" + cancelText + "' id='" + this.elementId + "' data-dtvalue='" + this.value + "' " + this.disabled + "></ion-datetime>" +
             // " <input class='daynamicForm-DateTime' type='text' id='" + this.elementId + "' value='" + this.value + "' "+this.disabled+" (click)='showDateTimePicker()'/>"+
             // " <input class='daynamicForm-DateTime' type='date' id='" + this.elementId + "' value='" + dateValue+ "' "+this.disabled+" />"+
             // " <input class='daynamicForm-DateTime' type='time' id='" + this.elementId + "Time' value='" + timeValue + "' "+this.disabled+" />"+
+            " <div style='" + hideToolTipClass + "' data-tooltip='" + this.toolTipText + "' class='toolTip'><ion-icon style='font-size: 20px' name='information-circle-outline'></ion-icon> </div>" +
             "</ion-item>"
         return template;
     }
diff --git a/Mohem/src/app/uI-elements/date.input.ts b/Mohem/src/app/uI-elements/date.input.ts
index c0f7b0a6..0261d3af 100644
--- a/Mohem/src/app/uI-elements/date.input.ts
+++ b/Mohem/src/app/uI-elements/date.input.ts
@@ -9,7 +9,8 @@ export class DateInput extends UiElement {
         private disabled: string,
         private hidden: string,
         private required: string,
-        private language: string = 'en') {
+        private language: string = 'en',
+        private toolTipText: string) {
         super(elementId, containerId, '');
         this.createElement(this.getTemplate());
     }
@@ -23,6 +24,7 @@ export class DateInput extends UiElement {
     }
     public getTemplate() {
         let requiredClass: string = "";
+        let hideToolTipClass: string = "";
         const doneText = this.language === 'en' ? 'Done' : 'تم';
         const cancelText = this.language === 'en' ? 'Cancel' : 'إلغاء';
         if (this.disabled == "N") { this.disabled = "disabled" } else { this.disabled = "" }
@@ -36,19 +38,23 @@ export class DateInput extends UiElement {
         }
         if (this.required == 'Y')
             requiredClass = "requiredClass"
+        
+        if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"}
+        
         const template =
             // "<div class='custom-text-area-element' style='"+this.hidden+"'>" +
             // " <label  class='daynamicForm-Label "+requiredClass+"' id='title' >" + this.label + "</label>" +
             // " <input class='daynamicForm-DateTime' type='date' id='" + this.elementId + "' value='" + this.value + "' "+this.disabled+" />"+
             // "</div> ";
 
-            "<ion-item class='dynamicField'>" +
+            "<ion-item class='dynamicField ion-item-position'>" +
             " <ion-label position='floating' style='font-size: medium !important;' class='dynamiclable-float " + requiredClass + "' id='title' >" + this.label + "</ion-label>" +
             // " <div class='daynamicForm-DateTime " + disaledClass + "'  id='" + this.elementId + "' data-dtvalue='" + this.value + "' " + this.disabled + ">" + this.value + "</div>" +
-            "<ion-datetime min='1900' max='2100' class='onic-date' (ionChange)='setDate()'  displayFormat='MMM/DD/YYYY'   value='" + this.value + "' done-text='" + doneText + "' cancel-text='" + cancelText + "' id='" + this.elementId + "' data-dtvalue='" + this.value + "' " + this.disabled + " ></ion-datetime>" +
+            "<ion-datetime style='width: 85%;' min='1900' max='2100' class='onic-date' (ionChange)='setDate()'  displayFormat='MMM/DD/YYYY'   value='" + this.value + "' done-text='" + doneText + "' cancel-text='" + cancelText + "' id='" + this.elementId + "' data-dtvalue='" + this.value + "' " + this.disabled + " ></ion-datetime>" +
             // " <input class='daynamicForm-DateTime' type='text' id='" + this.elementId + "' value='" + this.value + "' "+this.disabled+" (click)='showDateTimePicker()'/>"+
             // " <input class='daynamicForm-DateTime' type='date' id='" + this.elementId + "' value='" + dateValue+ "' "+this.disabled+" />"+
             // " <input class='daynamicForm-DateTime' type='time' id='" + this.elementId + "Time' value='" + timeValue + "' "+this.disabled+" />"+
+            " <div style='" + hideToolTipClass + "' data-tooltip='" + this.toolTipText + "' class='toolTip'><ion-icon style='font-size: 20px' name='information-circle-outline'></ion-icon> </div>" +
             "</ion-item>"
 
         return template;
diff --git a/Mohem/src/app/uI-elements/number.input.ts b/Mohem/src/app/uI-elements/number.input.ts
index e8b68ee9..324af9f0 100644
--- a/Mohem/src/app/uI-elements/number.input.ts
+++ b/Mohem/src/app/uI-elements/number.input.ts
@@ -8,7 +8,8 @@ export class NumberInput extends UiElement {
         private containerId: string,
         private disabled: string,
         private hidden: string,
-        private required: string) {
+        private required: string,
+        private toolTipText: string) {
         super(elementId, containerId, '');
         this.createElement(this.getTemplate());
 
@@ -16,19 +17,22 @@ export class NumberInput extends UiElement {
 
     public getTemplate() {
         let requiredClass: string = "";
+        let hideToolTipClass: string = "";
         if (this.required == 'Y')
             requiredClass = "requiredClass"
         if (this.disabled == "N") { this.disabled = "disabled" } else { this.disabled = "" }
         if (this.hidden == "N") { this.hidden = "display:none;" } else { this.hidden = "" }
+        if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"}
         const template =
             // "<div class='custom-text-area-element' style='" + this.hidden + "'>" +
             // " <label  class='daynamicForm-Label " + requiredClass + "' id='title' >" + this.label + "</label>" +
             // " <input class='daynamicForm-Input' type='number' id='" + this.elementId + "' value='" + this.value + "' " + this.disabled + " />" +
             // "</div> ";
 
-            "<ion-item style='" + this.hidden + "' class='dynamicField'> " +
+            "<ion-item style='" + this.hidden + "' class='dynamicField ion-item-position'> " +
             "<ion-label position='floating' style='font-size: medium !important;' class='" + requiredClass + " dynamiclable-float'>" + this.label + "</ion-label>" +
-            "<ion-input type='number' id='" + this.elementId + "' value='" + this.value + "' " + this.disabled + "> </ion-input>" +
+            "<ion-input style='width: 85%;' type='number' id='" + this.elementId + "' value='" + this.value + "' " + this.disabled + "> </ion-input>" +
+            " <div style='" + hideToolTipClass + "' data-tooltip='" + this.toolTipText + "' class='toolTip'><ion-icon style='font-size: 20px' name='information-circle-outline'></ion-icon> </div>" +
             "</ion-item> ";
 
         return template;
diff --git a/Mohem/src/app/uI-elements/select.input.ts b/Mohem/src/app/uI-elements/select.input.ts
index b2f1f756..715c6d1c 100644
--- a/Mohem/src/app/uI-elements/select.input.ts
+++ b/Mohem/src/app/uI-elements/select.input.ts
@@ -11,7 +11,8 @@ export class SelectInput extends UiElement {
         private containerId: string,
         private disabled: string,
         private hidden: string,
-        private required: string) {
+        private required: string,
+        private toolTipText: string) {
         super(elementId, containerId, '');
         this.direction = TranslatorService.getCurrentLanguageName();
         this.createElement(this.getTemplate());
@@ -21,12 +22,14 @@ export class SelectInput extends UiElement {
 
     public getTemplate() {
         let template :string = "";
+        let hideToolTipClass: string = "";
         let requiredClass: string = "";
         if (this.required == 'Y')
             requiredClass = "requiredClass"
         if (this.disabled == "N") { this.disabled = "disabled" } else { this.disabled = "" }
         if (this.hidden == "N") { this.hidden = "display:none;" } else { this.hidden = "" }
-    //     const template =
+        if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"}
+        //     const template =
     //    "<div class='custom-text-area-element dynamicField' style='"+this.hidden+"'>" +
     //    " <label  class='daynamicForm-Label "+requiredClass+"' id='title' >" + this.label + "</label>" +
     //    " <select [ngClass]= direction == 'en'? 'daynamicForm-Select' : 'ardaynamicForm-Select' id='" + this.elementId + "' "+this.disabled+">"+
@@ -35,20 +38,22 @@ export class SelectInput extends UiElement {
     //    "</div> ";
    if(this.direction == 'en'){
      template =
-    "<div class='custom-text-area-element dynamicField' style='"+this.hidden+"'>" +
+    "<div class='custom-text-area-element dynamicField ion-item-position' style='"+this.hidden+"'>" +
     " <label  class='daynamicForm-Label "+requiredClass+"' id='title' >" + this.label + "</label>" +
-    " <select  class='daynamicForm-Select' id='" + this.elementId + "' "+this.disabled+">"+
+    " <select style='width: 80%;' class='daynamicForm-Select' id='" + this.elementId + "' "+this.disabled+">"+
     "<option value='"+this.value+"' >"+this.value+"</option>"+
     "</select>"+
+    " <div style='" + hideToolTipClass + "' data-tooltip='" + this.toolTipText + "' class='toolTip'><ion-icon style='font-size: 20px' name='information-circle-outline'></ion-icon> </div>" +
     "</div> ";
    }
    else{
      template =
-    "<div class='custom-text-area-element dynamicField' style='"+this.hidden+"'>" +
+    "<div class='custom-text-area-element dynamicField ion-item-position' style='"+this.hidden+"'>" +
     " <label  class='ardaynamicForm-Label "+requiredClass+"' id='title' >" + this.label + "</label>" +
-    " <select  class='ardaynamicForm-Select' id='" + this.elementId + "' "+this.disabled+">"+
+    " <select style='width: 80%;'  class='ardaynamicForm-Select' id='" + this.elementId + "' "+this.disabled+">"+
     "<option value='"+this.value+"' >"+this.value+"</option>"+
     "</select>"+
+    " <div style='" + hideToolTipClass + "' data-tooltip='" + this.toolTipText + "' class='toolTip'><ion-icon style='font-size: 20px' name='information-circle-outline'></ion-icon> </div>" +
     "</div> ";
 
    }
diff --git a/Mohem/src/app/uI-elements/text.input.ts b/Mohem/src/app/uI-elements/text.input.ts
index 985563b4..347d9aa9 100644
--- a/Mohem/src/app/uI-elements/text.input.ts
+++ b/Mohem/src/app/uI-elements/text.input.ts
@@ -1,6 +1,5 @@
 import { UiElement } from "./ui-element";
 
-
 export class TextInput extends UiElement {
 
     constructor(
@@ -11,22 +10,26 @@ export class TextInput extends UiElement {
         private textVal: string,
         private disabled: string,
         private hidden: string,
-        private required: string) {
+        private required: string,
+        private toolTipText: string) {
         super(elementId, containerId, '');
         this.createElement(this.getTemplate());
     }
 
     public getTemplate() {
         let requiredClass: string = "";
+        let hideToolTipClass: string = "";
         if (this.required === 'Y')
             requiredClass = "requiredClass"
         if (this.disabled === "N") { this.disabled = "disabled" } else { this.disabled = "" }
         if (this.hidden === "N") { this.hidden = "display:none;" } else { this.hidden = "" }
+        if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"}
         const template =
             // "<div class='custom-text-area-element' style='" + this.hidden + "'>" +
-            "<ion-item style='" + this.hidden + "' class='dynamicField'>" +
+            "<ion-item style='" + this.hidden + "' class='dynamicField ion-item-position'>" +
             " <ion-label position='floating' style='font-size: medium;' class='" + requiredClass + " dynamiclable-float'>" + this.label + "</ion-label>" +
-            " <ion-input style='' type='text' data-colm-text='" + this.value + "' id='" + this.elementId + "' value='" + this.textVal + "' " + this.disabled + "></ion-input>" +
+            " <ion-input style='width: 85%;' type='text' data-colm-text='" + this.value + "' id='" + this.elementId + "' value='" + this.textVal + "' " + this.disabled + "></ion-input>" +
+            " <div style='" + hideToolTipClass + "' data-tooltip='" + this.toolTipText + "' class='toolTip'><ion-icon style='font-size: 20px' name='information-circle-outline'></ion-icon> </div>" +
             "</ion-item> ";
 
         return template;
diff --git a/Mohem/src/app/uI-elements/time.input.ts b/Mohem/src/app/uI-elements/time.input.ts
index a8d156fa..d61b5ccd 100644
--- a/Mohem/src/app/uI-elements/time.input.ts
+++ b/Mohem/src/app/uI-elements/time.input.ts
@@ -10,7 +10,8 @@ export class TimeInput extends UiElement {
         private disabled: string,
         private hidden: string,
         private required: string,
-        private language: string = 'en') {
+        private language: string = 'en',
+        private toolTipText: string) {
         super(elementId, containerId, '');
         this.createElement(this.getTemplate());
 
@@ -26,6 +27,7 @@ export class TimeInput extends UiElement {
     public getTemplate() {
 
         let requiredClass = '';
+        let hideToolTipClass: string = "";
         let disaledClass = '';
         const doneText = this.language === 'en' ? 'Done' : 'تم';
         const cancelText = this.language === 'en' ? 'Cancel' : 'إلغاء';
@@ -39,11 +41,13 @@ export class TimeInput extends UiElement {
         if (this.value === 'currentTime') {
             this.formatDate();
         }
+        if (this.toolTipText) { hideToolTipClass = ""} else { hideToolTipClass = "display:none;"};
 
         const template =
-        "<ion-item class='dynamicField' style='" + this.hidden + "'>" +
+        "<ion-item class='dynamicField ion-item-position' style='" + this.hidden + "'>" +
         " <ion-label position='floating' style='font-size: medium !important;' class='dynamiclable-float " + requiredClass + "' id='title' >" + this.label + "</ion-label>" +
-        "<ion-datetime display-format='HH:mm' picker-format='HH:mm' class='onic-date'  value='" + this.value + "' done-text='" + doneText + "' cancel-text='" + cancelText + "' id='" + this.elementId + "' data-dtvalue='" + this.value + "' " + this.disabled + " ></ion-datetime>" +
+        "<ion-datetime style='width: 85%;' display-format='HH:mm' picker-format='HH:mm' class='onic-date'  value='" + this.value + "' done-text='" + doneText + "' cancel-text='" + cancelText + "' id='" + this.elementId + "' data-dtvalue='" + this.value + "' " + this.disabled + " ></ion-datetime>" +
+        " <div style='" + hideToolTipClass + "' data-tooltip='" + this.toolTipText + "' class='toolTip'><ion-icon style='font-size: 20px' name='information-circle-outline'></ion-icon> </div>" +
         "</ion-item>"
         return template;
     }
diff --git a/Mohem/src/app/uI-elements/ui-element.ts b/Mohem/src/app/uI-elements/ui-element.ts
index 2d7ec8f8..4101e54c 100644
--- a/Mohem/src/app/uI-elements/ui-element.ts
+++ b/Mohem/src/app/uI-elements/ui-element.ts
@@ -24,11 +24,12 @@ export class UiElement {
     }
   }
 
+
+
   public onClicked(listener: any) {
     this.registerEvent('click', listener);
   }
 
-
   public onChanged(listener: any) {
     this.registerEvent('change', listener);
   }
diff --git a/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts b/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts
index 0e844ddc..6adc2342 100644
--- a/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts
+++ b/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.ts
@@ -503,22 +503,22 @@ export class CreateVacationRuleComponent implements OnInit {
       if (RespondAttributesList[i].ATTRIBUTE_TYPE == "VARCHAR2") {
         console.log("1");
 
-        this.textInput = new TextInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", "");
+        this.textInput = new TextInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", "", RespondAttributesList.REQ_COL_TIP);
       } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "LOOKUP") {
         console.log("2");
         //call create WF_LOOKUP
         //call there or when the got response from responsedAtt
-        this.selectInput = new SelectInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "");
+        this.selectInput = new SelectInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", RespondAttributesList[i].REQ_COL_TIP);
         this.getWFLookUp(RespondAttributesList[i].ATTRIBUTE_FORMAT, RespondAttributesList[i].ATTRIBUTE_NAME);
 
       } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "DATE") {
         console.log("3");
 
-        this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", this.direction);
+        this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", this.direction, RespondAttributesList[i].REQ_COL_TIP);
       } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "NUMBER") {
         console.log("4");
 
-        this.numberInput = new NumberInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "");
+        this.numberInput = new NumberInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", RespondAttributesList[i].REQ_COL_TIP);
       }
     }
   }
diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html
index 692a683a..403a6a67 100644
--- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html
+++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html
@@ -109,10 +109,10 @@
 
 
   <div class="centerDiv">
-      <ion-button class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px;    --background: transparent; " ion-button (click)="closePage()">
+      <ion-button class="footer-button" style="background: var(--newgreen)!important;border-radius: 10px;    --background: transparent; --border-radius: 10px; " ion-button (click)="closePage()">
         {{'general, save' | translate}}</ion-button>
   
-        <ion-button class="footer-button" style="background: var(--darkblue)!important;border-radius: 10px;    --background: transparent; " ion-button (click)="closeModal()">
+        <ion-button class="footer-button" style="background: var(--darkblue)!important;border-radius: 10px;    --background: transparent; --border-radius: 10px;" ion-button (click)="closeModal()">
         {{'general, cancel' | translate}}</ion-button>
     </div>
 </ion-footer>
\ No newline at end of file
diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts
index acc38009..5e3a8869 100644
--- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts
+++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.ts
@@ -414,22 +414,22 @@ createVacationDynamicFields(RespondAttributesList) {
     if (RespondAttributesList[i].ATTRIBUTE_TYPE == "VARCHAR2") {
       console.log("1");
 
-      this.textInput = new TextInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", "");
+      this.textInput = new TextInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", "", RespondAttributesList[i].REQ_COL_TIP);
     } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "LOOKUP") {
       console.log("2");
       //call create WF_LOOKUP
       //call there or when the got response from responsedAtt
-      this.selectInput = new SelectInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "");
+      this.selectInput = new SelectInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", RespondAttributesList[i].REQ_COL_TIP);
       this.getWFLookUp(RespondAttributesList[i].ATTRIBUTE_FORMAT, RespondAttributesList[i].ATTRIBUTE_NAME);
 
     } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "DATE") {
       console.log("3");
 
-      this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", this.direction);
+      this.dateInput = new DateInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", this.direction, RespondAttributesList.REQ_COL_TIP);
     } else if (RespondAttributesList[i].ATTRIBUTE_TYPE == "NUMBER") {
       console.log("4");
 
-      this.numberInput = new NumberInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "");
+      this.numberInput = new NumberInput(RespondAttributesList[i].ATTRIBUTE_DISPLAY_NAME, RespondAttributesList[i].ATTRIBUTE_NAME, "", containerId, "", "", "", RespondAttributesList[i].REQ_COL_TIP);
     }
   }
 }
diff --git a/Mohem/src/assets/font/Inter-V.ttf b/Mohem/src/assets/font/Inter-V.ttf
new file mode 100644
index 00000000..be66f25d
Binary files /dev/null and b/Mohem/src/assets/font/Inter-V.ttf differ
diff --git a/Mohem/src/assets/font/NotoKufiArabic-Regular-1.ttf b/Mohem/src/assets/font/NotoKufiArabic-Regular-1.ttf
new file mode 100644
index 00000000..3c9947bc
Binary files /dev/null and b/Mohem/src/assets/font/NotoKufiArabic-Regular-1.ttf differ
diff --git a/Mohem/src/assets/font/NotoKufiArabic-Regular.ttf b/Mohem/src/assets/font/NotoKufiArabic-Regular.ttf
new file mode 100644
index 00000000..6a2bacbc
Binary files /dev/null and b/Mohem/src/assets/font/NotoKufiArabic-Regular.ttf differ
diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Black.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Black.ttf
new file mode 100644
index 00000000..ba9166ea
Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Black.ttf differ
diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Bold.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Bold.ttf
new file mode 100644
index 00000000..632d37c5
Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Bold.ttf differ
diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraBold.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraBold.ttf
new file mode 100644
index 00000000..42da3f37
Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraBold.ttf differ
diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraLight.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraLight.ttf
new file mode 100644
index 00000000..9a73c08f
Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraLight.ttf differ
diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Light.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Light.ttf
new file mode 100644
index 00000000..9a562814
Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Light.ttf differ
diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Medium.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Medium.ttf
new file mode 100644
index 00000000..a8f68e5d
Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Medium.ttf differ
diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Regular.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Regular.ttf
new file mode 100644
index 00000000..b04620fa
Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Regular.ttf differ
diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-SemiBold.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-SemiBold.ttf
new file mode 100644
index 00000000..e4fe4dc7
Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-SemiBold.ttf differ
diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Thin.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Thin.ttf
new file mode 100644
index 00000000..0d5c9121
Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Thin.ttf differ
diff --git a/Mohem/src/assets/icon/icon_CS.png b/Mohem/src/assets/icon/icon_CS.png
new file mode 100644
index 00000000..11242978
Binary files /dev/null and b/Mohem/src/assets/icon/icon_CS.png differ
diff --git a/Mohem/src/assets/icon/moe-logo.png b/Mohem/src/assets/icon/moe-logo.png
new file mode 100644
index 00000000..da66b11e
Binary files /dev/null and b/Mohem/src/assets/icon/moe-logo.png differ
diff --git a/Mohem/src/assets/icon/moving.gif b/Mohem/src/assets/icon/moving.gif
index ffefdb00..531de7e8 100644
Binary files a/Mohem/src/assets/icon/moving.gif and b/Mohem/src/assets/icon/moving.gif differ
diff --git a/Mohem/src/assets/icon/new-design/BusinessTrip.png b/Mohem/src/assets/icon/new-design/BusinessTrip.png
new file mode 100644
index 00000000..c0362daf
Binary files /dev/null and b/Mohem/src/assets/icon/new-design/BusinessTrip.png differ
diff --git a/Mohem/src/assets/icon/new-design/leave_balance.png b/Mohem/src/assets/icon/new-design/leave_balance.png
index c915cc7e..2cda716b 100644
Binary files a/Mohem/src/assets/icon/new-design/leave_balance.png and b/Mohem/src/assets/icon/new-design/leave_balance.png differ
diff --git a/Mohem/src/assets/icon/new-design/moe-logo.png b/Mohem/src/assets/icon/new-design/moe-logo.png
new file mode 100644
index 00000000..0f36db9e
Binary files /dev/null and b/Mohem/src/assets/icon/new-design/moe-logo.png differ
diff --git a/Mohem/src/assets/icon/new-design/ticket_balance.png b/Mohem/src/assets/icon/new-design/ticket_balance.png
index f769f41c..a999a076 100644
Binary files a/Mohem/src/assets/icon/new-design/ticket_balance.png and b/Mohem/src/assets/icon/new-design/ticket_balance.png differ
diff --git a/Mohem/src/assets/icon/new-design/work_list.png b/Mohem/src/assets/icon/new-design/work_list.png
index 6b7b2dd6..cc256591 100644
Binary files a/Mohem/src/assets/icon/new-design/work_list.png and b/Mohem/src/assets/icon/new-design/work_list.png differ
diff --git a/Mohem/src/assets/icon/update_rocket_image.png b/Mohem/src/assets/icon/update_rocket_image.png
index 85862eba..1a029dff 100644
Binary files a/Mohem/src/assets/icon/update_rocket_image.png and b/Mohem/src/assets/icon/update_rocket_image.png differ
diff --git a/Mohem/src/assets/imgs/call-o.svg b/Mohem/src/assets/imgs/call-o.svg
index b5a9434a..8c77e70f 100644
--- a/Mohem/src/assets/imgs/call-o.svg
+++ b/Mohem/src/assets/imgs/call-o.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30">
   <g id="Group_7231" data-name="Group 7231" transform="translate(-111.351 -245.557)">
-    <circle id="Ellipse_152" data-name="Ellipse 152" cx="15" cy="15" r="15" transform="translate(111.351 245.557)" fill="#1fa169"/>
-    <path id="Path_13" data-name="Path 13" d="M11.706,9.111c-.791-.676-1.593-1.086-2.375-.411l-.466.408c-.341.3-.976,1.681-3.429-1.141S4.443,4.71,4.785,4.416l.469-.409c.777-.677.484-1.529-.077-2.406L4.839,1.07C4.276.2,3.663-.38,2.884.3L2.463.664A3.952,3.952,0,0,0,.922,3.279C.641,5.138,1.528,7.266,3.559,9.6s4.014,3.51,5.895,3.489a3.962,3.962,0,0,0,2.8-1.161l.422-.368c.777-.675.294-1.363-.5-2.041Z" transform="translate(119.204 254.187)" fill="#fff"/>
+    <circle id="Ellipse_152" data-name="Ellipse 152" cx="15" cy="15" r="15" transform="translate(111.351 245.557)" fill="#44a7a1"/>
+    <path id="Path_13" data-name="Path 13" d="M11.706,9.111c-.791-.676-1.593-1.086-2.375-.411l-.466.408c-.341.3-.976,1.681-3.429-1.141S4.443,4.71,4.785,4.416l.469-.409c.777-.677.484-1.529-.077-2.406L4.839,1.07C4.276.2,3.663-.38,2.884.3L2.463.664A3.952,3.952,0,0,0,.922,3.279C.641,5.138,1.528,7.266,3.559,9.6s4.014,3.51,5.9,3.489a3.962,3.962,0,0,0,2.8-1.161l.422-.368c.777-.675.294-1.363-.5-2.041Z" transform="translate(119.204 254.187)" fill="#fff"/>
   </g>
 </svg>
diff --git a/Mohem/src/assets/imgs/call.svg b/Mohem/src/assets/imgs/call.svg
index e7b1638d..60216890 100644
--- a/Mohem/src/assets/imgs/call.svg
+++ b/Mohem/src/assets/imgs/call.svg
@@ -1,5 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="19.572" height="21" viewBox="0 0 19.572 21">
-  <g id="phone-receiver-silhouette" transform="translate(-0.872 0)">
-    <path id="Path_13" data-name="Path 13" d="M18.252,14.616c-1.269-1.085-2.556-1.742-3.809-.659l-.748.655c-.547.475-1.565,2.7-5.5-1.831S6.6,7.556,7.149,7.085L7.9,6.429c1.246-1.086.776-2.453-.123-3.86l-.543-.852C6.332.313,5.349-.609,4.1.475l-.675.59A6.339,6.339,0,0,0,.953,5.26C.5,8.242,1.924,11.656,5.182,15.4s6.439,5.63,9.456,5.6a6.356,6.356,0,0,0,4.5-1.862l.678-.591c1.246-1.083.472-2.186-.8-3.274Z" transform="translate(0 0)" fill="#259cb8"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="19.576" height="21.001" viewBox="0 0 19.576 21.001">
+  <g id="phone-receiver-silhouette" transform="translate(-0.871 0)">
+    <path id="Path_13" data-name="Path 13" d="M18.252,14.616c-1.269-1.085-2.556-1.742-3.809-.659l-.748.655c-.547.475-1.565,2.7-5.5-1.831s-1.6-5.225-1.046-5.7L7.9,6.429c1.246-1.086.776-2.453-.123-3.86l-.543-.852C6.332.313,5.349-.609,4.1.475l-.675.59A6.339,6.339,0,0,0,.953,5.26c-.453,2.982.971,6.4,4.229,10.14s6.439,5.63,9.456,5.6a6.356,6.356,0,0,0,4.5-1.862l.678-.591c1.246-1.083.472-2.186-.8-3.274Z" fill="#004c70"/>
   </g>
 </svg>
diff --git a/Mohem/src/assets/imgs/defaultService.png b/Mohem/src/assets/imgs/defaultService.png
new file mode 100644
index 00000000..61b3b356
Binary files /dev/null and b/Mohem/src/assets/imgs/defaultService.png differ
diff --git a/Mohem/src/assets/imgs/profile-icons/basic-detail@21.svg b/Mohem/src/assets/imgs/profile-icons/basic-detail@21.svg
index 7eba7d6e..5d5b510f 100644
--- a/Mohem/src/assets/imgs/profile-icons/basic-detail@21.svg
+++ b/Mohem/src/assets/imgs/profile-icons/basic-detail@21.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
-  <g id="Group_7731" data-name="Group 7731" transform="translate(-111 -245.557)">
-    <circle id="Ellipse_152" data-name="Ellipse 152" cx="20" cy="20" r="20" transform="translate(111 245.557)" fill="#c6903e"/>
+  <g id="Group_7733" data-name="Group 7733" transform="translate(-111 -245.557)">
+    <circle id="Ellipse_152" data-name="Ellipse 152" cx="20" cy="20" r="20" transform="translate(111 245.557)" fill="#024d71"/>
     <g id="_57-Resume" data-name="57-Resume" transform="translate(117.088 252.214)">
       <path id="Path_4729" data-name="Path 4729" d="M18.773,8.481a2.431,2.431,0,0,1-2.431-2.431V2H7.431A2.431,2.431,0,0,0,5,4.431V22.254a2.431,2.431,0,0,0,2.431,2.431H20.393a2.431,2.431,0,0,0,2.431-2.431V8.481ZM11.481,6.051A2.431,2.431,0,1,1,9.051,8.481a2.431,2.431,0,0,1,2.431-2.431Zm-3.241,8.1a2.431,2.431,0,0,1,2.431-2.431h1.62a2.431,2.431,0,0,1,2.431,2.431v1.62a.81.81,0,0,1-.81.81H9.051a.81.81,0,0,1-.81-.81Zm10.532,6.481H9.051a.81.81,0,0,1,0-1.62h9.722a.81.81,0,0,1,0,1.62Zm0-4.051h-1.62a.81.81,0,0,1,0-1.62h1.62a.81.81,0,0,1,0,1.62Zm0-4.051h-1.62a.81.81,0,0,1,0-1.62h1.62a.81.81,0,0,1,0,1.62Z" fill="#fff"/>
       <path id="Path_4730" data-name="Path 4730" d="M21.81,6.971h3.581L21,2.58V6.161A.81.81,0,0,0,21.81,6.971Z" transform="translate(-3.037 -0.11)" fill="#fff"/>
diff --git a/Mohem/src/assets/imgs/profile-icons/editingWhite.png b/Mohem/src/assets/imgs/profile-icons/editingWhite.png
new file mode 100644
index 00000000..6adddb71
Binary files /dev/null and b/Mohem/src/assets/imgs/profile-icons/editingWhite.png differ
diff --git a/Mohem/src/assets/imgs/profile-icons/family-g.svg b/Mohem/src/assets/imgs/profile-icons/family-g.svg
index 553b6086..c4588ee3 100644
--- a/Mohem/src/assets/imgs/profile-icons/family-g.svg
+++ b/Mohem/src/assets/imgs/profile-icons/family-g.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="39" height="39" viewBox="0 0 39 39">
   <g id="Group_7680" data-name="Group 7680" transform="translate(-111 -245.557)">
-    <circle id="Ellipse_152" data-name="Ellipse 152" cx="19.5" cy="19.5" r="19.5" transform="translate(111 245.557)" fill="#259cb8"/>
-    <path id="family_3_" data-name="family (3)" d="M9.537,15.144v.993A3.01,3.01,0,0,1,6.53,19.144H2.647A.344.344,0,0,1,2.3,18.8V16.984A2.186,2.186,0,0,1,4.487,14.8H9.193A.344.344,0,0,1,9.537,15.144ZM6.53,19.831c-2.567,0-3.49.008-3.871,0a.343.343,0,0,0-.355.343v.637a2.977,2.977,0,1,0,5.953-.024v-.852a.343.343,0,0,0-.458-.324A3.674,3.674,0,0,1,6.53,19.831Zm4.753,11.8a3.875,3.875,0,0,1-1.948.006.172.172,0,0,0-.177.274,1.486,1.486,0,0,0,2.3-.007A.171.171,0,0,0,11.283,31.633Zm1.506-.259h-.071a.339.339,0,0,0-.321.237,2.184,2.184,0,0,1-3.968.451,2.276,2.276,0,0,1-.208-.449.344.344,0,0,0-.325-.238H7.806a2.062,2.062,0,0,0-2.062,2.062v.344a.344.344,0,0,0,.344.344h8.42a.344.344,0,0,0,.344-.344v-.344A2.062,2.062,0,0,0,12.789,31.374ZM2.307,30.112H.344A.344.344,0,0,0,0,30.455v3.324a.344.344,0,0,0,.344.344H2.307a.344.344,0,0,0,.344-.344V30.455A.344.344,0,0,0,2.307,30.112Zm5.736-5.361a.344.344,0,0,0-.181-.625l-.1,0a.284.284,0,0,0-.266.184,2.33,2.33,0,0,1-2.142,1.547,2.362,2.362,0,0,1-2.182-1.591.208.208,0,0,0-.2-.14A2.976,2.976,0,0,0,0,27.1v1.98a.344.344,0,0,0,.344.344H2.307a.344.344,0,0,0,.344-.344v-.144a.351.351,0,0,1,.321-.354.344.344,0,0,1,.366.343v4.854a.344.344,0,0,0,.344.344H4.713a.343.343,0,0,0,.344-.35c0-.089,0-.195,0-.338a2.754,2.754,0,0,1,2-2.644.344.344,0,0,0,.178-.543,3.873,3.873,0,0,1,.813-5.5Zm9.574-.626a.279.279,0,0,0-.265.193,2.209,2.209,0,0,1-2.046,1.526,2.305,2.305,0,0,1-2.07-1.545.277.277,0,0,0-.258-.174c-.077,0-.156,0-.239,0a.344.344,0,0,0-.186.625,3.873,3.873,0,0,1,.81,5.5.344.344,0,0,0,.177.543,2.754,2.754,0,0,1,2,2.645c0,.143,0,.249,0,.338a.343.343,0,0,0,.344.35h1.031a.344.344,0,0,0,.344-.344V28.925a.344.344,0,0,1,.366-.343.351.351,0,0,1,.321.354v.144a.344.344,0,0,0,.344.344h1.964a.344.344,0,0,0,.344-.344V27.1A2.976,2.976,0,0,0,17.618,24.124Zm.326,6.331v3.324a.344.344,0,0,0,.344.344h1.964a.344.344,0,0,0,.344-.344V30.455a.344.344,0,0,0-.344-.344H18.287A.344.344,0,0,0,17.944,30.455ZM15.374,14.82A4.284,4.284,0,0,0,11.052,19.1V23.36a.344.344,0,0,0,.469.32,3.654,3.654,0,0,1,.567-.166.345.345,0,0,0,.207-.544,3.711,3.711,0,0,1-.722-2.2V19.442a1.031,1.031,0,0,1,1.043-1.031,12.582,12.582,0,0,0,4.157-.649,1.618,1.618,0,0,1,2.133,1.532v1.5a3.678,3.678,0,0,1-.721,2.183.343.343,0,0,0,.2.542,3.63,3.63,0,0,1,.737.242.344.344,0,0,0,.488-.312v-4.3a4.315,4.315,0,0,0-4.237-4.334Zm-5.076,9.9a3.179,3.179,0,1,0,3.179,3.179A3.183,3.183,0,0,0,10.3,24.715Zm4.123-.347a.172.172,0,0,0-.164.285,1.382,1.382,0,0,0,2.176-.062.172.172,0,0,0-.182-.274A3.688,3.688,0,0,1,14.421,24.368Zm2.572-5.954a13.252,13.252,0,0,1-4.385.684.343.343,0,0,0-.348.344v1.326a2.98,2.98,0,1,0,5.959.024v-1.5A.93.93,0,0,0,16.993,18.414ZM4.35,24.35a.172.172,0,0,0-.171.282,1.545,1.545,0,0,0,2.381-.053.172.172,0,0,0-.182-.275A3.669,3.669,0,0,1,4.35,24.35Z" transform="translate(120.203 239.361)" fill="#fff"/>
+    <circle id="Ellipse_152" data-name="Ellipse 152" cx="19.5" cy="19.5" r="19.5" transform="translate(111 245.557)" fill="#024d71"/>
+    <path id="family_3_" data-name="family (3)" d="M9.537,15.144v.993A3.01,3.01,0,0,1,6.53,19.144H2.647A.344.344,0,0,1,2.3,18.8V16.984A2.186,2.186,0,0,1,4.487,14.8H9.193a.344.344,0,0,1,.344.344ZM6.53,19.831c-2.567,0-3.49.008-3.871,0a.343.343,0,0,0-.355.343v.637a2.977,2.977,0,1,0,5.953-.024v-.852a.343.343,0,0,0-.458-.324,3.674,3.674,0,0,1-1.269.22Zm4.753,11.8a3.875,3.875,0,0,1-1.948.006.172.172,0,0,0-.177.274,1.486,1.486,0,0,0,2.3-.007.171.171,0,0,0-.175-.271Zm1.506-.259h-.071a.339.339,0,0,0-.321.237,2.184,2.184,0,0,1-3.968.451,2.276,2.276,0,0,1-.208-.449.344.344,0,0,0-.325-.238h-.09a2.062,2.062,0,0,0-2.062,2.062v.344a.344.344,0,0,0,.344.344h8.42a.344.344,0,0,0,.344-.344v-.344a2.062,2.062,0,0,0-2.063-2.061ZM2.307,30.112H.344A.344.344,0,0,0,0,30.455v3.324a.344.344,0,0,0,.344.344H2.307a.344.344,0,0,0,.344-.344V30.455a.344.344,0,0,0-.344-.343Zm5.736-5.361a.344.344,0,0,0-.181-.625h-.1a.284.284,0,0,0-.266.184,2.33,2.33,0,0,1-2.142,1.547,2.362,2.362,0,0,1-2.182-1.591.208.208,0,0,0-.2-.14A2.976,2.976,0,0,0,0,27.1v1.98a.344.344,0,0,0,.344.344H2.307a.344.344,0,0,0,.344-.344v-.144a.351.351,0,0,1,.321-.354.344.344,0,0,1,.366.343v4.854a.344.344,0,0,0,.344.344H4.713a.343.343,0,0,0,.344-.35v-.338a2.754,2.754,0,0,1,2-2.644.344.344,0,0,0,.178-.543,3.873,3.873,0,0,1,.813-5.5Zm9.574-.626a.279.279,0,0,0-.265.193,2.209,2.209,0,0,1-2.046,1.526,2.305,2.305,0,0,1-2.07-1.545.277.277,0,0,0-.258-.174h-.239a.344.344,0,0,0-.186.625,3.873,3.873,0,0,1,.81,5.5.344.344,0,0,0,.177.543,2.754,2.754,0,0,1,2,2.645c0,.143,0,.249,0,.338a.343.343,0,0,0,.344.35h1.031a.344.344,0,0,0,.344-.344V28.925a.344.344,0,0,1,.366-.343.351.351,0,0,1,.321.354v.144a.344.344,0,0,0,.344.344h1.964a.344.344,0,0,0,.344-.344V27.1a2.976,2.976,0,0,0-2.98-2.976Zm.326,6.331V33.78a.344.344,0,0,0,.344.344h1.964a.344.344,0,0,0,.344-.344V30.455a.344.344,0,0,0-.344-.344H18.287a.344.344,0,0,0-.343.344ZM15.374,14.82a4.284,4.284,0,0,0-4.322,4.28v4.26a.344.344,0,0,0,.469.32,3.654,3.654,0,0,1,.567-.166.345.345,0,0,0,.207-.544,3.711,3.711,0,0,1-.722-2.2V19.442a1.031,1.031,0,0,1,1.043-1.031,12.582,12.582,0,0,0,4.157-.649,1.618,1.618,0,0,1,2.133,1.532v1.5a3.678,3.678,0,0,1-.721,2.183.343.343,0,0,0,.2.542,3.63,3.63,0,0,1,.737.242.344.344,0,0,0,.488-.312v-4.3a4.315,4.315,0,0,0-4.237-4.334ZM10.3,24.72A3.179,3.179,0,1,0,13.477,27.9,3.179,3.179,0,0,0,10.3,24.72Zm4.123-.347a.172.172,0,0,0-.164.285,1.382,1.382,0,0,0,2.176-.062.172.172,0,0,0-.182-.274,3.688,3.688,0,0,1-1.83.046Zm2.572-5.954a13.252,13.252,0,0,1-4.385.684.343.343,0,0,0-.348.344v1.326a2.98,2.98,0,1,0,5.959.024V19.3a.93.93,0,0,0-1.226-.883ZM4.35,24.35a.172.172,0,0,0-.171.282,1.545,1.545,0,0,0,2.381-.053.172.172,0,0,0-.182-.275,3.669,3.669,0,0,1-2.028.046Z" transform="translate(120.203 239.361)" fill="#fff"/>
   </g>
 </svg>
diff --git a/Mohem/src/assets/imgs/profile-icons/info-a@2x.svg b/Mohem/src/assets/imgs/profile-icons/info-a@2x.svg
index 18d86df0..faa7b256 100644
--- a/Mohem/src/assets/imgs/profile-icons/info-a@2x.svg
+++ b/Mohem/src/assets/imgs/profile-icons/info-a@2x.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
-  <g id="Group_7714" data-name="Group 7714" transform="translate(-111 -245.557)">
-    <circle id="Ellipse_152" data-name="Ellipse 152" cx="20" cy="20" r="20" transform="translate(111 245.557)" fill="#c6903e"/>
+  <g id="Group_7734" data-name="Group 7734" transform="translate(-111 -245.557)">
+    <circle id="Ellipse_152" data-name="Ellipse 152" cx="20" cy="20" r="20" transform="translate(111 245.557)" fill="#024d71"/>
     <g id="user_19_" data-name="user (19)" transform="translate(123.58 256.534)">
       <g id="Group_7233" data-name="Group 7233" transform="translate(3.133)">
         <g id="Group_7232" data-name="Group 7232">
diff --git a/Mohem/src/assets/imgs/profile-icons/main address-a@2x.svg b/Mohem/src/assets/imgs/profile-icons/main address-a@2x.svg
index 2d488ca7..81069c34 100644
--- a/Mohem/src/assets/imgs/profile-icons/main address-a@2x.svg	
+++ b/Mohem/src/assets/imgs/profile-icons/main address-a@2x.svg	
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
-  <g id="Group_7716" data-name="Group 7716" transform="translate(-111 -245.557)">
-    <circle id="Ellipse_152" data-name="Ellipse 152" cx="20" cy="20" r="20" transform="translate(111 245.557)" fill="#c6903e"/>
+  <g id="Group_7736" data-name="Group 7736" transform="translate(-111 -245.557)">
+    <circle id="Ellipse_152" data-name="Ellipse 152" cx="20" cy="20" r="20" transform="translate(111 245.557)" fill="#024d71"/>
     <g id="Pin" transform="translate(123.979 255.501)">
       <path id="Path_4580" data-name="Path 4580" d="M15.542,0A7.552,7.552,0,0,0,8,7.542c0,5.414,7.026,12.2,7.325,12.481a.311.311,0,0,0,.434,0c.3-.286,7.325-7.067,7.325-12.481A7.552,7.552,0,0,0,15.542,0Zm0,11A3.457,3.457,0,1,1,19,7.542,3.457,3.457,0,0,1,15.542,11Z" transform="translate(-8)" fill="#fff"/>
     </g>
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json
index 568e8924..0afb61c6 100644
--- a/Mohem/src/assets/localization/i18n.json
+++ b/Mohem/src/assets/localization/i18n.json
@@ -266,8 +266,8 @@
             "ar": "لا توجد بيانات متاحة للمفضلة"
         },
         "concurrent-report": {
-            "en": "Concurrent Report",
-            "ar": "تقرير متزامن"
+            "en": "Reports",
+            "ar": "تقرير"
         },
         "update-contact": {
             "en": "Update contact information",
@@ -423,7 +423,7 @@
         },
         "close": {
             "en": "Close",
-            "ar": "إغلق"
+            "ar": "إغلاق"
         },
         "back": {
             "en": "Back",
@@ -1199,6 +1199,10 @@
             "en": "Leave Balance",
             "ar": "رصيد الإجازات"
         },
+        "business-balance": {
+            "en": "Business Trip Balance",
+            "ar": "رصيد رحلة العمل"
+        },
         "": {
             "en": "",
             "ar": ""
@@ -1244,8 +1248,8 @@
             "ar": "الحضور الشهري"
         },
         "monthly-time-sheet-view": {
-            "en": "View your Monthly Time Sheet",
-            "ar": "عرض  حضورك الشهري لساعات العمل"
+            "en": "View profile and Personal Information",
+            "ar": "عرض الملف الشخصي والمعلومات الشخصية"
         },
         "view-detail": {
             "en": "View Detail",
@@ -1951,6 +1955,10 @@
             "en": "Ticket Balance",
             "ar": "رصيد التذاكر"
         },
+        "my-request": {
+            "en": "My Requests",
+            "ar": "طلباتي"
+        },
         "selectType": {
             "en": "Select Type",
             "ar": "اختر النوع"
@@ -2003,6 +2011,18 @@
             "en": "My Team",
             "ar": "فريقي"
         },
+        "search-email": {
+            "en": "Search By Email",
+            "ar": "البحث عن طريق البريد الإلكتروني"
+        },
+        "search-name": {
+            "en": "Search By Name",
+            "ar": "البحث عن طريق الإسم"
+        },
+        "search-username": {
+            "en": "Search By Username",
+            "ar": "البحث باسم المستخدم"
+        },
         "total": {
             "en": "TOTAL",
             "ar": "عدد"
@@ -2071,9 +2091,9 @@
         }
     },
     "eit": {
-        "my-reports": {
-            "en": "My Reports",
-            "ar": "تقاريري"
+        "required-text": {
+            "en": "Please fill the required fields!",
+            "ar": "يرجى تعبئة جميع الحقول المطلوبة!"
         },
         "done-text": {
             "en": "Done",
@@ -2087,6 +2107,10 @@
             "en": "My Requests",
             "ar": "طلباتي"
         },
+        "my-reports": {
+            "en": "My Reports",
+            "ar": "تقاريري"
+        },
         "added": {
             "en": "Added",
             "ar": "وأضاف"
@@ -2116,8 +2140,16 @@
             "ar": "فشل تحميل بعض الملفات المرفقة"
         },
         "approval-message-success": {
-            "en": "Your request has been submitted for approvals.",
-            "ar": "تم إرسال طلبك للحصول على الموافقات."
+            "en": "Your request has been submitted successfully!",
+            "ar": "تم تقديم الطلب بنجاح"
+        },
+        "basic-approval-message-success": {
+            "en": "Your request has been submitted successfully!",
+            "ar": "تم تقديم الطلب بنجاح"
+        },
+        "contact-approval-message-success": {
+            "en": "Your request has been submitted successfully!",
+            "ar": "تم تقديم الطلب بنجاح"
         },
         "delete-perm": {
             "en": "Are you sure from deleting this file permanently?",
@@ -3562,8 +3594,8 @@
             "ar": "طلب معرف"
         },
         "output": {
-            "en": "Output",
-            "ar": "انتاج"
+            "en": "Download",
+            "ar": "تحميل"
         }
     }
 }
\ No newline at end of file
diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss
index 31c36bed..dd948176 100644
--- a/Mohem/src/theme/styles.scss
+++ b/Mohem/src/theme/styles.scss
@@ -1,46 +1,101 @@
-//   $font-family-base: "WorkSans-Regular" !default;
 body {
-    :root[dir="rtl"] {
+    ion-app[lang="en"] {
+        font-family: var(--fontFamilyBoldEN) !important;
+
+    }
+
+    ion-app[lang="ar"] {
         font-family: var(--fontFamilyIOSAR) !important;
+        line-height: 1.3;
     }
 
-    :root[dir="ltr"] {
-        font-family: var(--fontFamilyMediumEN) !important;
+}
+
+ion-app[lang="en"] {
+
+    input,
+    textarea,
+    p,
+    label,
+    div,
+    h1,
+    h2,
+    h3,
+    button,
+    ion-button,
+    ion-title,
+    span {
+        font-size: 16px;
+        font-family: var(--fontFamilyBoldEN) !important;
     }
 }
 
-input,
-textarea,
-p,
-label,
-div {
-    font-size: 16px;
+ion-app[lang="ar"] {
 
-    :root[dir="rtl"] {
+
+    p,
+    label,
+    div,
+    h1,
+    h2,
+    h3,
+    button,
+    ion-button,
+    ion-title,
+    span {
         font-family: var(--fontFamilyIOSAR) !important;
+        line-height: 1.3;
     }
+}
 
-    :root[dir="ltr"] {
-        font-family: var(--fontFamilyLightEN) !important;
+.header-toolbar {
+    --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #1a586d 100%);
+}
+
+ion-app[lang="en"] {
+
+    .boldTxt,
+    p.boldTxt,
+    .boldTxt>label {
+
+        font-family: var(--fontFamilyBoldEN) !important;
     }
 }
 
-h1,
-h2,
-h3,
-button {
-    :root[dir="rtl"] {
+ion-app[lang="ar"] {
+
+    .boldTxt,
+    p.boldTxt,
+    .boldTxt>label {
         font-family: var(--fontFamilyIOSAR) !important;
+        font-weight: bold;
+        line-height: 1.3;
     }
+}
+
+ion-app[lang="en"] {
+
+    ion-label.boldTxtNav.label.label-md,
+    ion-label.boldTxtNav.label.label-ios,
+    ion-label {
+        // font-weight: bold;
+        color: var(--dark);
 
-    :root[dir="ltr"] {
-        font-family: var(--fontFamilyMediumEN) !important;
-    }
 
+        font-family: var(--fontFamilyBoldEN) !important;
+    }
 }
 
-.header-toolbar {
-    --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #c6903e 100%);
+ion-app[lang="ar"] {
+
+    ion-label.boldTxtNav.label.label-md,
+    ion-label.boldTxtNav.label.label-ios,
+    ion-label {
+        font-family: var(--fontFamilyIOSAR) !important;
+        font-weight: bold;
+        line-height: 1.3;
+    }
+
 }
 
 ion-label {
@@ -93,7 +148,7 @@ ion-label {
 .loading-gif {
     background: transparent !important;
     width: 100px;
-    height: 100px;
+    height: 120px;
 }
 
 #custom-progress-loader .container {
@@ -636,6 +691,10 @@ ion-col.colBold>label {
     margin-bottom: 20px;
 }
 
+.ion-item-position {
+    position: relative;
+}
+
 
 .daynamicForm-Label {
     font-size: 16px;
@@ -1224,13 +1283,14 @@ div.no-dataDiv {
     // min-width: 200px;
     min-height: 45px !important;
     border-radius: 5px !important;
+    --border-radius: 5px !important;
     width: 125px !important;
     min-width: 5px !important;
     width: 10px !important;
     margin: 8px !important;
     --background: transparent;
-    --border-radius: 5px !important;
     --box-shadow: none;
+
 }
 
 .confirmBtn {
@@ -1242,12 +1302,12 @@ div.no-dataDiv {
     min-height: 45px !important;
     border-radius: 5px !important;
     --border-radius: 5px !important;
-    --box-shadow: none;
     width: 125px !important;
     min-width: 5px !important;
     width: 10px !important;
     margin: 8px !important;
     --background: transparent;
+    --box-shadow: none;
 }
 
 .checkOutOkBtn {
@@ -1256,6 +1316,7 @@ div.no-dataDiv {
     margin-top: 10px !important;
     margin-bottom: 10px !important;
     border-radius: 5px !important;
+    --border-radius: 5px !important;
     height: 40px !important;
     min-height: 40px !important;
     background: var(--lightblue) !important;
@@ -1267,7 +1328,7 @@ div.no-dataDiv {
     border: none !important;
     width: 80%;
     --background: var(--lightblue) !important;
-
+    --box-shadow: none;
 }
 
 .checkOutCancelBtn {
@@ -1276,6 +1337,7 @@ div.no-dataDiv {
     margin-top: 10px !important;
     margin-bottom: 10px !important;
     border-radius: 5px !important;
+    --border-radius: 5px !important;
     height: 40px !important;
     min-height: 40px !important;
     background: var(--darkblue) !important;
@@ -1287,6 +1349,7 @@ div.no-dataDiv {
     border: none !important;
     width: 80%;
     --background: var(--darkblue) !important;
+    --box-shadow: none;
 }
 
 .buttonClassWhite {
@@ -1367,7 +1430,7 @@ div.no-dataDiv {
 .active-Segment {
     border-radius: 25px !important;
     // font-size: 0.3cm !important;
-    background: var(--newgreen) !important;
+    background: #004C70 !important;
     color: var(--light) !important;
     font-weight: bold !important;
     text-transform: none;
@@ -1395,6 +1458,8 @@ div.no-dataDiv {
     border-radius: 25px !important;
     border: 1px solid #cccccc;
     margin-top: 10px;
+    width: 98%;
+    margin: 10px 0;
 }
 
 
@@ -1822,7 +1887,7 @@ ion-segment-button {
     --border-radius: 0.4cm;
 }
 
-.modal-image-viewer-portrait {
+.modal-image-viewer-portrait { 
     --height: 45% !important;
     --width: 60% !important;
     --border-radius: 0.4cm;
@@ -1830,6 +1895,7 @@ ion-segment-button {
 
 .menu-label {
     margin-left: 5px;
+    margin-bottom: 7px;
 }
 
 ion-app[dir="rtl"] {
@@ -1842,10 +1908,65 @@ ion-app[dir="rtl"] {
         margin-right: 10px !important;
     }
 
-    .slideFullWidth .swiper-slide {
+
+    .iconBox img {
+        margin: 5px !important;
+    }
+
+    .pClass {
+        font-size: 10px;
+    }
+
+}
+
+.ion-color-secondary {
+    --ion-color-base: #004D71 !important;
+}
+
+ion-app[dir="ltr"] {
+
+    .dynamic-form .swiper-container .swiper-wrapper .swiper-slide:first-child {
+        margin-left: 5px !important;
+    }
+    
+
+
+
+    app-my-team {
+        .request-heading span {
+            margin: 0 !important;
+            padding: 0 !important;
+        }
+    }
+}
+
+ion-app[dir="rtl"] {
+
+    .slideFullWidth .swiper-container .swiper-wrapper .swiper-slide:first-child {
+        margin-right: 10px;
+    }
+
+    .dynamic-form .swiper-container .swiper-wrapper .swiper-slide:first-child {
+        margin-right: 10px !important;
+    }
+
+    .attendance-module {
+        margin-left: 0px !important;
+        margin-right: 10px !important;
+        ion-button {
+            height: 40px !important;
+        }
+    }
+
+    .slideFullWidth {
         margin-right: 0px !important;
     }
 
+    .menu-label {
+        margin-right: 10px !important;
+    }
+
+
     .iconBox img {
         // margin: 5px !important;
     }
@@ -1865,23 +1986,44 @@ ion-app[dir="rtl"] {
         margin-left: 10px;
         text-align: left;
     }
+}
 
-    .attendance-module {
-        ion-button {
-            font-size: 15px !important;
-        }
-    }
 
-    .search-header{
-        h2 {
-            margin-right: 20px;
-        }
-        ion-icon {
-            right: unset !important;
-            left: 20px !important;
-            top: 10px !important;
-        }
-    }
+.float-right-moe {
+    float: right;
+}
 
+.float-left-moe {
+    float: left;
+}
+
+[dir="ltr"] .toolTip {
+    position: absolute;
+    right: 20px;
+    top: 20px;
+    z-index: 999;
+}
+
+[dir="rtl"] .toolTip {
+    position: absolute;
+    left: 20px;
+    top: 20px;
+    z-index: 999;
+}
+
+[dir="rtl"] .text-span-moe {
+    font-size: 8px !important;
+}
 
+.toolTip-inside {
+    position: relative;
+    left: 0;
+    right: 0;
+    height: 10px;
+    width: 10px;
+    display: inline-block;
+    margin: 0px 5px 5px 10px;
+  }
+.toolTip-inside ion-icon{
+    position: absolute;
 }
\ No newline at end of file
diff --git a/Mohem/src/theme/variables.scss b/Mohem/src/theme/variables.scss
index 40ecc2e0..4f4e2e16 100644
--- a/Mohem/src/theme/variables.scss
+++ b/Mohem/src/theme/variables.scss
@@ -68,31 +68,57 @@
   src: url('../assets/font/Poppins/Poppins-Regular.ttf');
 }
 
+@font-face {
+  font-family: Inter;
+  src: url('../assets/font/Inter-V.ttf');
+}
+
+@font-face {
+  font-family: Kufi;
+  src: url('../assets/font/NotoKufiArabic-Regular-1.ttf');
+}
+
+@font-face {
+  font-family: Kufi;
+  src: url('../assets/font/notokufi/NotoKufiArabic-Regular.ttf');
+}
+
+@font-face {
+  font-family: Kufi-Semibold;
+  src: url('../assets/font/notokufi/NotoKufiArabic-SemiBold.ttf');
+}
+
+@font-face {
+  font-family: Kufi-Bold;
+  src: url('../assets/font/notokufi/NotoKufiArabic-Bold.ttf');
+}
+
 :root {
-  --ion-font-family: 'Poppins';
+  --ion-font-family: 'Inter';
   --break-small: 450px;
   --break-big: 565px;
   //$break-large: 1200px;
-  --fontFamilyLightEN: 'Poppins';
-  --ontFamilyLightAR: 'GE_SS_Two_Light';
-  --fontFamilyRegularEN: 'Poppins';
-  --fontFamilyRegularAR: 'GE_SS_TWO_MEDIUM';
-  --fontFamilyMediumEN: 'Poppins-Regular';
-  --fontFamilyMediumAR: 'GE_SS_TWO_MEDIUM';
-  --fontFamilyBoldEN: 'Poppins-Bold';
-  --fontFamilyBoldAR: 'GE_SS_Two_Bold';
-  --fontFamilySemiBoldEN: 'Poppins-Bold';
-  --fontFamilySemiBoldAR: 'GE_SS_Two_Bold';
-  --fontFamilyIOSAR: -apple-system, "Helvetica Neue", "Roboto", sans-serif;
-  --fontFamilyAndroidAR: "Roboto", "Helvetica Neue", sans-serif;
+  --fontFamilyLightEN: 'Inter';
+  --ontFamilyLightAR: 'Kufi';
+  --fontFamilyRegularEN: 'Inter';
+  --fontFamilyRegularAR: 'Kufi';
+  --fontFamilyMediumEN: 'Inter';
+  --fontFamilyMediumAR: 'Kufi';
+  --fontFamilyBoldEN: 'Inter';
+  --fontFamilyBoldAR: 'Kufi';
+  --fontFamilySemiBoldEN: 'Inter';
+  --fontFamilySemiBoldAR: 'Kufi';
+  --fontFamilyIOSAR: 'Kufi';
+  --fontFamilyIOSARSEMIBOLD: 'Kufi-Semibold';
+  --fontFamilyAndroidAR: 'Kufi';
   --primary: #3ac1f1;
   --secondary: #19a163;
   --danger: #f53d3d;
-  --customnavy: #c6903e;
+  --customnavy: #44A7A1;
   --light: #ffffff;
-  --dark: #000000;
+  --dark: #004D71;
   --gray: #e4e5e7;
-  --custgreen: #209a83;
+  --custgreen: #44A7A1;
   --cusgray: #d9d9d9;
   --darkgray: #7F8C8D;
   --grayBG: #acacac;
diff --git a/Mohem/src/theme/worklist.scss b/Mohem/src/theme/worklist.scss
index cb20fcf3..4311fa49 100644
--- a/Mohem/src/theme/worklist.scss
+++ b/Mohem/src/theme/worklist.scss
@@ -1,136 +1,137 @@
-.colorBG{
-    --background: #f0efef !important;
-    background: #f0efef !important;
+.colorBG {
+  --background: #f0efef !important;
+  background: #f0efef !important;
 
-   }
-   .footerSearchBtn{
-    padding: 50px !important;
-    background: #f0efef !important;
 }
 
-
-.headerRow{
-    padding-top: 10px;
-    padding-bottom: 10px;
+.footerSearchBtn {
+  background: #f0efef !important;
+  height: 15% !important;
 }
-.itemReqList{
-    background: #f0efef;
-    margin-top: 20px;
-    width: 100%;
-    // width: 95%;
-    // margin-left:9px
 
-}
-.gridItemReq{
-    //width:95%;
+
+.headerRow {
+  padding-top: 10px;
+  padding-bottom: 10px;
 }
 
+.itemReqList {
+  background: #f0efef;
+  margin-top: 20px;
+  width: 100%;
+  // width: 95%;
+  // margin-left:9px
 
-.itemReqContent{
-    // margin-top: 17px;
-    margin-bottom: 10px;
-    border-radius: 7px;
-    text-align: left;
 }
-.itemReqDiv{
-    padding:10px;
-    width: 100%;
-    // padding-bottom: 10px;
-    // padding-top: 10px;
+
+.itemReqContent {
+  // margin-top: 17px;
+  margin-bottom: 10px;
+  border-radius: 7px;
+  text-align: left;
 }
-.arrowIcon{
-width: 18px !important;
 
-margin-right: -21px !important;
-margin-left: 10px !important;
+.itemReqDiv {
+  padding: 10px;
+  width: 100%;
+  // padding-bottom: 10px;
+  // padding-top: 10px;
 }
-.actionList{
-    // position: fixed;
-    // bottom: 0px;
-    bottom: -7px;
-    width: 215px;
-    border-top-left-radius: 7px;
-    border-top-right-radius: 7px
+
+.arrowIcon {
+  width: 18px !important;
+
+  margin-right: -21px !important;
+  margin-left: 10px !important;
 }
-.cardContent{
-    // width:100%;
-    // margin-top: 33px
+
+.actionList {
+  // position: fixed;
+  // bottom: 0px;
+  bottom: -7px;
+  width: 215px;
+  border-top-left-radius: 7px;
+  border-top-right-radius: 7px
 }
-.colItemReq{
-    color: var(--darkblue);
-    font-weight: bold !important;;
-    font-size: 16px ;
-    text-align: left;
-    display: contents;
-    font-family: var(--ion-font-family,inherit);
-    font-size: inherit;
-    text-overflow: ellipsis;
-    white-space: normal;
-    overflow: hidden;
-    box-sizing: border-box;
+
+.colItemReq {
+  color: var(--darkblue);
+  font-weight: bold !important;
+  ;
+  font-size: 16px;
+  text-align: left;
+  display: contents;
+  font-family: var(--ion-font-family, inherit);
+  font-size: inherit;
+  text-overflow: ellipsis;
+  white-space: normal;
+  overflow: hidden;
+  box-sizing: border-box;
 }
 
-.colItemReqHeader{
-text-align: justify;
-color: var(--cyanblue);
-font-weight: bold;
+.colItemReqHeader {
+  text-align: justify;
+  color: var(--cyanblue);
+  font-weight: bold;
 }
-.labelTotal{
- color: var(--danger);
- font-weight: bold;
- font-size: 17px;
+
+.labelTotal {
+  color: var(--danger);
+  font-weight: bold;
+  font-size: 17px;
 
 
 }
-.labelAction{
-color:var(--customnavy) !important;
-font-weight:bold;
+
+.labelAction {
+  color: var(--customnavy) !important;
+  font-weight: bold;
 }
-.colItems{
-padding-bottom: 10px
+
+.colItems {
+  padding-bottom: 10px
 }
 
 
 ion-label.labelValue.sc-ion-label-ios-h.sc-ion-label-ios-s.ios.hydrated,
-ion-label.labelValue.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated
-{
-    white-space: pre-wrap !important;
-    --color: initial;
-    display: contents;
-    color: var(--color);
-    font-family: var(--ion-font-family,inherit);
-    font-size: inherit;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box
+ion-label.labelValue.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated {
+  white-space: pre-wrap !important;
+  --color: initial;
+  display: contents;
+  color: var(--color);
+  font-family: var(--ion-font-family, inherit);
+  font-size: inherit;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box
 }
 
-.segmentPR{
+.segmentPR {
 
-    // --background-hover: rgba(var(--ion-color-contrast-rgb),0.04);
-   // --background-activated: var(--danger);
-   // --color: rgba(--primary);
-    --color-checked: var(--dark);
-    --indicator-color-checked: var(--secondary);
-    --background: #f0efef;
-    --background-activated: #f0efef;
-    --background-hover:#f0efef;
-    --background-activated:#f0efef;
-    --background-checked:#f0efef;
+  // --background-hover: rgba(var(--ion-color-contrast-rgb),0.04);
+  // --background-activated: var(--danger);
+  // --color: rgba(--primary);
+  --color-checked: var(--dark);
+  --indicator-color-checked: var(--secondary);
+  --background: #f0efef;
+  --background-activated: #f0efef;
+  --background-hover: #f0efef;
+  --background-activated: #f0efef;
+  --background-checked: #f0efef;
 
 
 
 }
 
 .ion-modal#ion-overlay-1 {
-    width: 90%;
-    height: 50%;
-    top: 20%;
-    left: 5%;
-    right: 5%;
-    bottom: 5%;
-    border: solid 1px red;
+  width: 90%;
+  height: 50%;
+  top: 20%;
+  left: 5%;
+  right: 5%;
+  bottom: 5%;
+  border: solid 1px red;
 
 }
 
@@ -145,477 +146,508 @@ ion-label.labelValue.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated
 //     top: 6px !important;
 //     bottom: 0px !important;
 //   }
-  
+
 //   .swiper-pagination {
 //     top: 6px;
 //   }
 
 
 .bar-stable {
-    background-color: var(--cusgray) !important;
-  }
-  .tabs{
-    background-color: var(--cusgray) !important;
-  }
-  .icon-size-lg {
-    font-size: 40px;
-  }
-  
-  /*Timeline*/
-  
-  .pos-absolute-right {
-      position: absolute;
-      right: 8px;
-  }
-  
-  .timeline {
-      position: relative;
-      margin: 15px 0 0 0;
-    //   border-bottom: solid 1px var(--cusgray);
-  }
-  
-  .timeline:before {
-   
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    width: 4px;
-    // background: #e4e4e4;
-    z-index: 1;
-    left: 35px;
-    /* margin-left: -10px; */
-    /* z-index: 1; */
-  }
-  
-  .timeline-en .timeline-thumb {
-   
-    border-radius: 500px;
-    width: 70px !important;
-    z-index: 2;
-    position: absolute;
-    left: 0px;
-    // :root[dir="ltr"]{
-    //    left: 37px;
-    // }
-    // :root[dir="rtl"]{
-    //     right: 37px;
-    // }
-    float: right;
-    top: 9px;
-  }
+  background-color: var(--cusgray) !important;
+}
 
-  .timeline-ar .timeline-thumb {
-   
-    border-radius: 500px;
-    width: 70px !important;
-    z-index: 2;
-    position: absolute;
-    left: 0px;
-    // :root[dir="ltr"]{
-    //    left: 37px;
-    // }
-    // :root[dir="rtl"]{
-    //     right: 37px;
-    // }
-    float: right;
-    top: 9px;
-  }
-  
-  .timeline .timeline-thumb.timeline-icon {
-      height: 67px;
-    //   text-align: center;
-    //   color: white;
-    //   border: 5px solid #CBD0D3;
-    //   transform: scale(0.2);
-  }
-  
+.tabs {
+  background-color: var(--cusgray) !important;
+}
 
-  
-  .timeline .timeline-item {
-    // width: 40px;
-  
-  }
-  
-  .timeline .timeline-stats {
-      position: relative;
-      font-size: 12px;
-      color: var(--darkgray);
-    
-  }
-  
-  
-  .divider-title {
-      background: #e4e4e4;
-      padding: 5px 15px;
-  }
-  
- 
-  .color-red {
-      color: var(--danger) !important;
-  }
-  
-  .bg-color-dot {
-
-   background: var(--gray); 
-   
-    /* background: linear-gradient(45deg, var(--primary) 0%, #19a163 36%, var(--secondary) 59%, var(--customnavy) 100%); */
-   // border: var(--secondary) solid 1px;
-     // background-color: #ff3b30 !important;
-    // background: var(--primary); 
-     //background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary)  36%,var(--secondary)  59%, var(--customnavy) 100%); 
-     //background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary)  36%,var(--secondary)  59%, var(--customnavy) 100%); 
-     //background: linear-gradient(45deg, var(--primary) 0%, var(--secondary)  36%,var(--secondary)  59%, var(--customnavy) 100%); 
-    
+.icon-size-lg {
+  font-size: 40px;
+}
+
+/*Timeline*/
+
+.pos-absolute-right {
+  position: absolute;
+  right: 8px;
+}
+
+.timeline {
+  position: relative;
+  margin: 15px 0 0 0;
+  //   border-bottom: solid 1px var(--cusgray);
+}
+
+.timeline:before {
+
+  content: '';
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  width: 4px;
+  // background: #e4e4e4;
+  z-index: 1;
+  left: 35px;
+  /* margin-left: -10px; */
+  /* z-index: 1; */
+}
+
+.timeline-en .timeline-thumb {
+
+  border-radius: 500px;
+  width: 70px !important;
+  z-index: 2;
+  position: absolute;
+  left: 0px;
+  // :root[dir="ltr"]{
+  //    left: 37px;
+  // }
+  // :root[dir="rtl"]{
+  //     right: 37px;
+  // }
+  float: right;
+  top: 9px;
+}
+
+.timeline-ar .timeline-thumb {
+
+  border-radius: 500px;
+  width: 70px !important;
+  z-index: 2;
+  position: absolute;
+  left: 0px;
+  // :root[dir="ltr"]{
+  //    left: 37px;
+  // }
+  // :root[dir="rtl"]{
+  //     right: 37px;
+  // }
+  float: right;
+  top: 9px;
+}
+
+.timeline .timeline-thumb.timeline-icon {
+  height: 67px;
+  //   text-align: center;
+  //   color: white;
+  //   border: 5px solid #CBD0D3;
+  //   transform: scale(0.2);
+}
+
+
+
+.timeline .timeline-item {
+  // width: 40px;
+
+}
+
+.timeline .timeline-stats {
+  position: relative;
+  font-size: 12px;
+  color: var(--darkgray);
+
+}
+
+
+.divider-title {
+  background: #e4e4e4;
+  padding: 5px 15px;
+}
+
+
+.color-red {
+  color: var(--danger) !important;
+}
+
+.bg-color-dot {
+
+  background: var(--gray);
+
+  /* background: linear-gradient(45deg, var(--primary) 0%, #19a163 36%, var(--secondary) 59%, var(--customnavy) 100%); */
+  // border: var(--secondary) solid 1px;
+  // background-color: #ff3b30 !important;
+  // background: var(--primary); 
+  //background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary)  36%,var(--secondary)  59%, var(--customnavy) 100%); 
+  //background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary)  36%,var(--secondary)  59%, var(--customnavy) 100%); 
+  //background: linear-gradient(45deg, var(--primary) 0%, var(--secondary)  36%,var(--secondary)  59%, var(--customnavy) 100%); 
+
+
+}
+
+.bg-blue-dot {
+
+  border: var(--blue) solid 1px;
+
+  background-repeat: no-repeat;
+  background-image: url("/assets/imgs/profile.png");
+  background-size: 100% 100%;
+
+}
+
+.bg-orange-dot {
+
+  border: var(--orange) solid 1px;
+  // background: var(--gray);
+  background-repeat: no-repeat;
+  background-image: url("/assets/imgs/profile.png");
+  background-size: 100% 100%;
+}
+
+.bg-red-dot {
+
+  border: var(--red) solid 1px;
+  // background: var(--gray); 
+  background-repeat: no-repeat;
+  background-image: url("/assets/imgs/profile.png");
+  background-size: 100% 100%;
+
+}
+
+.bg-green-dot {
+
+  border: var(--green) solid 1px;
+  // background: var(--gray);
+  background-repeat: no-repeat;
+  background-image: url("/assets/imgs/profile.png");
+  background-size: 100% 100%;
+}
+
+
+.bg-blue-txt {
+
+  color: var(--light) !important;
+  font-weight: bold;
+  background: var(--blue);
+  border-radius: 9px;
+  text-align: center;
+  margin-top: 10px;
+  position: relative;
+  width: auto;
+  height: 100%;
+  display: inline-block !important;
+  padding: 0px 7px 0px 7px;
+
+
+}
+
+.bg-orange-txt {
+  font-weight: bold;
+
+  color: var(--light) !important;
+  background: var(--orange);
+  border-radius: 9px;
+  text-align: center;
+  width: 30%;
+  margin-top: 10px;
+  position: relative;
+  width: auto;
+  height: 100%;
+  display: inline-block !important;
+  padding: 0px 7px 0px 7px;
+
+}
+
+.bg-red-txt {
+  font-weight: bold;
+  color: var(--light) !important;
+  background: var(--red);
+  border-radius: 9px;
+  text-align: center;
+  width: 30%;
+  margin-top: 10px;
+  position: relative;
+  width: auto;
+  height: 100%;
+  display: inline-block !important;
+  padding: 0px 7px 0px 7px;
 
-  }
 
-  .bg-blue-dot {
-
-    border: var(--blue) solid 1px; 
-
-    background-repeat: no-repeat;
-    background-image: url("/assets/imgs/profile.png");
-    background-size: 100% 100%;
-
-   }
-   .bg-orange-dot {
-
-    border: var(--orange) solid 1px; 
-    // background: var(--gray);
-    background-repeat: no-repeat;
-    background-image: url("/assets/imgs/profile.png");
-    background-size: 100% 100%; 
-   }
-   .bg-red-dot {
-
-    border: var(--red) solid 1px; 
-    // background: var(--gray); 
-    background-repeat: no-repeat;
-    background-image: url("/assets/imgs/profile.png");
-    background-size: 100% 100%;
-   
-   }
-   .bg-green-dot {
-
-    border: var(--green) solid 1px; 
-    // background: var(--gray);
-    background-repeat: no-repeat;
-    background-image: url("/assets/imgs/profile.png");
-    background-size: 100% 100%; 
-   }
-
-
-   .bg-blue-txt {
-
-    color: var(--light) !important; 
-    font-weight:bold;
-    background: var( --blue);
-    border-radius: 9px;
-    text-align: center;
-    margin-top: 10px;
-    position: relative;
-    width: auto;
-    height: 100%;
-    display: inline-block !important;
-    padding: 0px 7px 0px 7px;
-
-
-   }
-   .bg-orange-txt {
-    font-weight:bold;
-
-    color: var(--light) !important; 
-    background: var( --orange);
-    border-radius: 9px;
-    text-align: center;
-    width: 30%;
-    margin-top: 10px;
-    position: relative;
-    width: auto;
-    height: 100%;
-    display: inline-block !important;
-    padding: 0px 7px 0px 7px;
-
-   }
-   .bg-red-txt {
-    font-weight:bold;
-    color: var(--light) !important; 
-    background: var( --red);
-    border-radius: 9px;
-    text-align: center;
-    width: 30%;
-    margin-top: 10px;
-    position: relative;
-    width: auto;
-    height: 100%;
-    display: inline-block !important;
-    padding: 0px 7px 0px 7px;
-
-   
-   }
-   .bg-green-txt {
-    font-weight:bold;
-    color: var(--light) !important; 
-    background: var( --green);
-    border-radius: 9px;
-    text-align: center;
-    width: 30%;
-    margin-top: 10px;
-    position: relative;
-    width: auto;
-    height: 100%;
-    display: inline-block !important;
-    padding: 0px 7px 0px 7px;
-
-   }
-
-
-
-
-  
-.notification-list{
-ion-item{
+}
+
+.bg-green-txt {
+  font-weight: bold;
+  color: var(--light) !important;
+  background: var(--green);
+  border-radius: 9px;
+  text-align: center;
+  width: 30%;
+  margin-top: 10px;
+  position: relative;
+  width: auto;
+  height: 100%;
+  display: inline-block !important;
+  padding: 0px 7px 0px 7px;
+
+}
+
+
+
+
+
+.notification-list {
+  ion-item {
     // margin-top: 5px;
     // margin-bottom: 5px;
-  
+
     background-color: transparent;
-    .item-date{
-        width: 55px;
-        font-size: 14px !important;
-        font-weight: bold;
-     
-        text-align: center;
-        padding: 0;
-        margin: 0;
-     
-        position: absolute;
-        left: 0;
-        top: 0;
+
+    .item-date {
+      width: 55px;
+      font-size: 14px !important;
+      font-weight: bold;
+
+      text-align: center;
+      padding: 0;
+      margin: 0;
+
+      position: absolute;
+      left: 0;
+      top: 0;
     }
-    ion-label , [item-end]{
-    
-        white-space: normal;
-        font-size: 14px !important;
-        // :root[dir="ltr"]{
-        //     margin-left: 10px;
-        // }
-        // :root[dir="rtl"]{
-        //     margin-right: 10px;
-        // }
-        
+
+    ion-label,
+    [item-end] {
+
+      white-space: normal;
+      font-size: 14px !important;
+      // :root[dir="ltr"]{
+      //     margin-left: 10px;
+      // }
+      // :root[dir="rtl"]{
+      //     margin-right: 10px;
+      // }
+
     }
 
+  }
 }
-}
+
 .input-wrapper {
---flex:none;
+  --flex: none;
 }
-ion-input ,ion-datetime{
-// border-bottom: #dedede 1px solid;
+
+ion-input,
+ion-datetime {
+  // border-bottom: #dedede 1px solid;
 }
+
 .left {
-.timeline:before{
-left: 66px;
-}
-.notification-list ion-item{
+  .timeline:before {
+    left: 66px;
+  }
+
+  .notification-list ion-item {
     padding-left: 3px;
-}
-.timeline-thumb{
+  }
+
+  .timeline-thumb {
     left: 37px;
+  }
 }
-}
+
 .right {
-.timeline:before{
+  .timeline:before {
     right: 62px;
-    }
-    .notification-list ion-item{
-        padding-right: 3px;
-    }
-    .timeline-thumb{
-        right: 37px;
-    }
+  }
+
+  .notification-list ion-item {
+    padding-right: 3px;
+  }
+
+  .timeline-thumb {
+    right: 37px;
+  }
 }
 
 
-.itemHISBtn{
-    padding: 5px;
-    color: var(--light);
-    background: var(--darkgray);
-    border-radius: 3px;
-    width: 85%;
-    height: 40px;
-    display: block;
-    margin: 0 auto;
-    margin-top: 10px;
+.itemHISBtn {
+  padding: 5px;
+  color: var(--light);
+  background: var(--darkgray);
+  border-radius: 3px;
+  width: 85%;
+  height: 40px;
+  display: block;
+  margin: 0 auto;
+  margin-top: 10px;
 }
 
 
-.rowBtn{
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    background: white;
+.rowBtn {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  background: white;
 }
 
 
 
-.rowBorder{
-    border-bottom: solid 0.02cm var(--grayBG);
+.rowBorder {
+  border-bottom: solid 0.02cm var(--grayBG);
 
 }
-.colBorder{
-    border-right: solid 0.02cm var(--grayBG);
+
+.colBorder {
+  border-right: solid 0.02cm var(--grayBG);
 
 }
-.colBorder-ar{
+
+.colBorder-ar {
   border-left: solid 0.02cm var(--grayBG);
 
 }
 
-.dateActionHistory{
-    text-align: start;
-    // margin-top: -25px;
+.dateActionHistory {
+  text-align: start;
+  // margin-top: -25px;
 }
 
 
-.actionBtn{
-    --border-radius: 50% !important;
-    height: 55px;
-    width: 55px;
-    --background: var(--newgreen); // will be dynamic 
-    background: transparent;
-    margin:10px;
+.actionBtn {
+  --border-radius: 50% !important;
+  height: 55px;
+  width: 55px;
+  --background: var(--newgreen); // will be dynamic 
+  background: transparent;
+  margin: 10px;
 }
 
-.itemAttch{
-    border-radius: 11px;
-    margin: 8px;
-    --min-height: 60px;
-    --max-height: 60px;
+.itemAttch {
+  border-radius: 11px;
+  margin: 8px;
+  --min-height: 60px;
+  --max-height: 60px;
 }
 
 .less {
-    max-height: 54px;
-  }
-  .tipsPadding{
-    padding: 10px 10px;
-    border-radius: 10px;
-    margin: 10px;
-    border: 2px solid #e4e5e7;
-    color:  var(--darkblue);
-    background: white;
-    font-weight: bold;
-    text-align: justify;
-   
-  }
+  max-height: 54px;
+}
 
-  .noDataDiv{
-    background: #ffffff;
-    height: 11%;
-    text-align: center;
-    padding-top: 1px;
-    border-radius: 10px;
-    margin: 10px;
-  }
+.tipsPadding {
+  padding: 10px 10px;
+  border-radius: 10px;
+  margin: 10px;
+  border: 2px solid #e4e5e7;
+  color: var(--darkblue);
+  background: white;
+  font-weight: bold;
+  text-align: justify;
 
-  .containerNote {
-     font-size: 14px;
-    line-height: 14px;
-    height: 30px;
-    overflow: hidden;
-    text-align: justify;
-  }
-  
-  .show {
-    overflow: visible;
-    height: auto;
-  }
+}
 
-  .showMore{
-    padding: 0px;
-    background: transparent;
-    color: blue;
-    text-decoration: underline;
-    font-size: 14px;
-  }
-  .succssfullMSG{
-    height: 100%;
-    width: 100%;
-    background: var(--newgreen);
-    color: white;
-    font-weight: bold;
-    font-size: 20px;
-    text-align: center;
-    vertical-align: middle;
-    padding-top: 30px;
-  }
+.noDataDiv {
+  background: #ffffff;
+  height: 11%;
+  text-align: center;
+  padding-top: 1px;
+  border-radius: 10px;
+  margin: 10px;
+}
 
-  .succssfullIcon{
-    width: 60%;
-    text-align: center;
-    height: 36%;
-    padding-top: 100px;
-  }
-  .subjectNotification{
-    text-align: center;
-    padding-top: 10px;
-    font-weight: bold;
-  }
-  .tabBar{
-    height:70px
-  }
-  .empImge{
-    border-radius: 50% !important;
-    width: 60px !important;
-    height: 60px !important;
-    border: #dedede solid 1px;
+.containerNote {
+  font-size: 14px;
+  line-height: 14px;
+  height: 30px;
+  overflow: hidden;
+  text-align: justify;
+}
 
-  }
-  .empImgeRep {
-    border-radius: 50% !important;
-    width: 80px;
-    height: 80px;
-    border: #dedede solid 1px;
-  }
-  .empImgeSub{
-    border-radius: 50%;
-    width: 85px;
-    height: 85px;
-    border: #dedede solid 1px;
+.show {
+  overflow: visible;
+  height: auto;
+}
 
-  }
+.showMore {
+  padding: 0px;
+  background: transparent;
+  color: blue;
+  text-decoration: underline;
+  font-size: 14px;
+}
 
-  ion-card{
-      color:black !important;
-  }
+.succssfullMSG {
+  height: 100%;
+  width: 100%;
+  background: var(--newgreen);
+  color: white;
+  font-weight: bold;
+  font-size: 20px;
+  text-align: center;
+  vertical-align: middle;
+  padding-top: 30px;
+}
 
-  .line{
-    padding-bottom:87px;
-  }
+.succssfullIcon {
+  width: 60%;
+  text-align: center;
+  height: 36%;
+  padding-top: 100px;
+}
 
-  ion-segment-button ion-label {
-    max-width: 100px;
-    overflow: hidden;
-    padding: 10px;
-    font-size: 14px;
-    color: black !important;
-  }
+.subjectNotification {
+  text-align: center;
+  padding-top: 10px;
+  font-weight: bold;
+}
+
+.tabBar {
+  height: 70px
+}
 
-  .colItems ion-label {
-    color: black !important;
+.empImge {
+  border-radius: 50% !important;
+  width: 60px !important;
+  height: 60px !important;
+  border: #dedede solid 1px;
 
-  }
-  .approvalTitle{
-    font-weight: bold;
-    font-size: 16px;
-    text-align: left;
-  }
-  ion-input .replacmentSearchBar .native-input{
-    position: absolute !important;
-  }
+}
+
+.empImgeRep {
+  border-radius: 50% !important;
+  width: 80px;
+  height: 80px;
+  border: #dedede solid 1px;
+}
+
+.empImgeSub {
+  border-radius: 50%;
+  width: 85px;
+  height: 85px;
+  border: #dedede solid 1px;
+
+}
+
+ion-card {
+  color: black !important;
+}
+
+.line {
+  padding-bottom: 87px;
+}
+
+ion-segment-button ion-label {
+  max-width: 100px;
+  overflow: hidden;
+  padding: 10px;
+  font-size: 14px;
+  color: black !important;
+}
+
+.colItems ion-label {
+  color: black !important;
+
+}
+
+.approvalTitle {
+  font-weight: bold;
+  font-size: 16px;
+  text-align: left;
+}
+
+ion-input .replacmentSearchBar .native-input {
+  position: absolute !important;
+}
 
-  ion-input .replacmentSearchBar .input-clear-icon{
-    display: none !important;
-  }
\ No newline at end of file
+ion-input .replacmentSearchBar .input-clear-icon {
+  display: none !important;
+}
\ No newline at end of file
diff --git a/WifiWizard2.java b/WifiWizard2.java
deleted file mode 100644
index 03647d0a..00000000
--- a/WifiWizard2.java
+++ /dev/null
@@ -1,1891 +0,0 @@
-// /*
-//  * Copyright 2018 Myles McNamara
-//  *
-//  * Licensed under the Apache License, Version 2.0 (the "License");
-//  * you may not use this file except in compliance with the License.
-//  * You may obtain a copy of the License at
-//  *
-//  *      http://www.apache.org/licenses/LICENSE-2.0
-//  *  Unless required by applicable law or agreed to in writing, software
-//  *  distributed under the License is distributed on an "AS IS" BASIS,
-//  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  *  See the License for the specific language governing permissions and
-//  *  limitations under the License.
-//  */
-// package wifiwizard2;
-
-// import org.apache.cordova.*;
-
-// import java.util.List;
-// import java.lang.InterruptedException;
-
-// import org.json.JSONArray;
-// import org.json.JSONException;
-// import org.json.JSONObject;
-
-// import android.annotation.SuppressLint;
-// import android.app.PendingIntent;
-// import android.content.pm.PackageManager;
-// import android.content.BroadcastReceiver;
-// import android.content.Intent;
-// import android.content.IntentFilter;
-
-// import android.net.Network;
-// import android.net.NetworkCapabilities;
-// import android.net.NetworkInfo;
-// import android.net.NetworkRequest;
-// import android.net.DhcpInfo;
-
-// import android.net.wifi.WifiManager;
-// import android.net.wifi.WifiConfiguration;
-// import android.net.wifi.ScanResult;
-// import android.net.wifi.WifiInfo;
-// import android.net.wifi.SupplicantState;
-// import android.net.wifi.WifiNetworkSpecifier;
-// import android.net.ConnectivityManager;
-
-// import android.content.Context;
-// import android.os.AsyncTask;
-// import android.util.Log;
-// import android.os.Build.VERSION;
-// import android.os.PatternMatcher;
-
-// import java.net.URL;
-// import java.net.InetAddress;
-// import java.net.Inet4Address;
-// import java.net.InterfaceAddress;
-// import java.net.NetworkInterface;
-// import java.net.HttpURLConnection;
-
-// import java.net.UnknownHostException;
-
-// public class WifiWizard2 extends CordovaPlugin {
-//   private boolean hiddenSSID = false;
-
-//   private static final String TAG = "WifiWizard2";
-//   private static final int API_VERSION = VERSION.SDK_INT;
-
-//   private static final String ADD_NETWORK = "add";
-//   private static final String REMOVE_NETWORK = "remove";
-//   private static final String CONNECT_NETWORK = "connect";
-//   private static final String DISCONNECT_NETWORK = "disconnectNetwork";
-//   private static final String DISCONNECT = "disconnect";
-//   private static final String LIST_NETWORKS = "listNetworks";
-//   private static final String START_SCAN = "startScan";
-//   private static final String GET_SCAN_RESULTS = "getScanResults";
-//   private static final String GET_CONNECTED_SSID = "getConnectedSSID";
-//   private static final String GET_CONNECTED_BSSID = "getConnectedBSSID";
-//   private static final String GET_CONNECTED_NETWORKID = "getConnectedNetworkID";
-//   private static final String IS_WIFI_ENABLED = "isWifiEnabled";
-//   private static final String SET_WIFI_ENABLED = "setWifiEnabled";
-//   private static final String SCAN = "scan";
-//   private static final String ENABLE_NETWORK = "enable";
-//   private static final String DISABLE_NETWORK = "disable";
-//   private static final String GET_SSID_NET_ID = "getSSIDNetworkID";
-//   private static final String REASSOCIATE = "reassociate";
-//   private static final String RECONNECT = "reconnect";
-//   private static final String REQUEST_FINE_LOCATION = "requestFineLocation";
-//   private static final String GET_WIFI_IP_ADDRESS = "getWifiIP";
-//   private static final String GET_WIFI_ROUTER_IP_ADDRESS = "getWifiRouterIP";
-//   private static final String CAN_PING_WIFI_ROUTER = "canPingWifiRouter";
-//   private static final String CAN_CONNECT_TO_ROUTER = "canConnectToRouter";
-//   private static final String CAN_CONNECT_TO_INTERNET = "canConnectToInternet";
-//   private static final String IS_CONNECTED_TO_INTERNET = "isConnectedToInternet";
-//   private static final String RESET_BIND_ALL = "resetBindAll";
-//   private static final String SET_BIND_ALL = "setBindAll";
-//   private static final String GET_WIFI_IP_INFO = "getWifiIPInfo";
-
-
-
-//   private static final int SCAN_RESULTS_CODE = 0; // Permissions request code for getScanResults()
-//   private static final int SCAN_CODE = 1; // Permissions request code for scan()
-//   private static final int LOCATION_REQUEST_CODE = 2; // Permissions request code
-//   private static final int WIFI_SERVICE_INFO_CODE = 3;
-//   private static final String ACCESS_FINE_LOCATION = android.Manifest.permission.ACCESS_FINE_LOCATION;
-
-//   private static int LAST_NET_ID = -1;
-//   // This is for when SSID or BSSID is requested but permissions have not been granted for location
-//   // we store whether or not BSSID was requested, to recall the getWifiServiceInfo fn after permissions are granted
-//   private static boolean bssidRequested = false;
-
-//   private WifiManager wifiManager;
-//   private CallbackContext callbackContext;
-//   private JSONArray passedData;
-
-//   private ConnectivityManager connectivityManager;
-//   private ConnectivityManager.NetworkCallback networkCallback;
-
-//   // Store AP, previous, and desired wifi info
-//   private AP previous, desired;
-
-//   private PendingIntent pending_intent_net_req_received;
-//   private final BroadcastReceiver networkChangedReceiver = new NetworkChangedReceiver();
-//   private static final IntentFilter NETWORK_STATE_CHANGED_FILTER = new IntentFilter();
-
-//   static {
-//     NETWORK_STATE_CHANGED_FILTER.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
-//   }
-
-//   /**
-//    * WEP has two kinds of password, a hex value that specifies the key or a character string used to
-//    * generate the real hex. This checks what kind of password has been supplied. The checks
-//    * correspond to WEP40, WEP104 & WEP232
-//    */
-//   private static boolean getHexKey(String s) {
-//     if (s == null) {
-//       return false;
-//     }
-
-//     int len = s.length();
-//     if (len != 10 && len != 26 && len != 58) {
-//       return false;
-//     }
-
-//     for (int i = 0; i < len; ++i) {
-//       char c = s.charAt(i);
-//       if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'))) {
-//         return false;
-//       }
-//     }
-//     return true;
-//   }
-
-//   @Override
-//   public void initialize(CordovaInterface cordova, CordovaWebView webView) {
-//     super.initialize(cordova, webView);
-//     this.wifiManager = (WifiManager) cordova.getActivity().getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-//     this.connectivityManager = (ConnectivityManager) cordova.getActivity().getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
-//   }
-
-//   @Override
-//   public boolean execute(String action, JSONArray data, CallbackContext callbackContext)
-//           throws JSONException {
-
-//     this.callbackContext = callbackContext;
-//     this.passedData = data;
-
-//     // Actions that do not require WiFi to be enabled
-//     if (action.equals(IS_WIFI_ENABLED)) {
-//       this.isWifiEnabled(callbackContext);
-//       return true;
-//     } else if (action.equals(SET_WIFI_ENABLED)) {
-//       this.setWifiEnabled(callbackContext, data);
-//       return true;
-//     } else if (action.equals(REQUEST_FINE_LOCATION)) {
-//       this.requestLocationPermission(LOCATION_REQUEST_CODE);
-//       return true;
-//     } else if (action.equals(GET_WIFI_ROUTER_IP_ADDRESS)) {
-
-//       String ip = getWiFiRouterIP();
-
-//       if ( ip == null || ip.equals("0.0.0.0")) {
-//         callbackContext.error("NO_VALID_ROUTER_IP_FOUND");
-//         return true;
-//       } else {
-//         callbackContext.success(ip);
-//         return true;
-//       }
-
-//     } else if (action.equals(GET_WIFI_IP_ADDRESS) || action.equals(GET_WIFI_IP_INFO)) {
-//       String[] ipInfo = getWiFiIPAddress();
-//       String ip = ipInfo[0];
-//       String subnet = ipInfo[1];
-//       if (ip == null || ip.equals("0.0.0.0")) {
-//         callbackContext.error("NO_VALID_IP_IDENTIFIED");
-//         return true;
-//       }
-
-//       // Return only IP address
-//       if( action.equals( GET_WIFI_IP_ADDRESS ) ){
-//         callbackContext.success(ip);
-//         return true;
-//       }
-
-//       // Return Wifi IP Info (subnet and IP as JSON object)
-//       JSONObject result = new JSONObject();
-
-//       result.put("ip", ip);
-//       result.put("subnet", subnet);
-
-//       callbackContext.success(result);
-//       return true;
-//     }
-
-//     boolean wifiIsEnabled = verifyWifiEnabled();
-//     if (!wifiIsEnabled) {
-//       callbackContext.error("WIFI_NOT_ENABLED");
-//       return true; // Even though enable wifi failed, we still return true and handle error in callback
-//     }
-
-//     // Actions that DO require WiFi to be enabled
-//     if (action.equals(ADD_NETWORK)) {
-//       this.add(callbackContext, data);
-//     } else if (action.equals(IS_CONNECTED_TO_INTERNET)) {
-//       this.canConnectToInternet(callbackContext, true);
-//     } else if (action.equals(CAN_CONNECT_TO_INTERNET)) {
-//       this.canConnectToInternet(callbackContext, false);
-//     } else if (action.equals(CAN_PING_WIFI_ROUTER)) {
-//       this.canConnectToRouter(callbackContext, true);
-//     } else if (action.equals(CAN_CONNECT_TO_ROUTER)) {
-//       this.canConnectToRouter(callbackContext, false);
-//     } else if (action.equals(ENABLE_NETWORK)) {
-//       this.enable(callbackContext, data);
-//     } else if (action.equals(DISABLE_NETWORK)) {
-//       this.disable(callbackContext, data);
-//     } else if (action.equals(GET_SSID_NET_ID)) {
-//       this.getSSIDNetworkID(callbackContext, data);
-//     } else if (action.equals(REASSOCIATE)) {
-//       this.reassociate(callbackContext);
-//     } else if (action.equals(RECONNECT)) {
-//       this.reconnect(callbackContext);
-//     } else if (action.equals(SCAN)) {
-//       this.scan(callbackContext, data);
-//     } else if (action.equals(REMOVE_NETWORK)) {
-//       this.remove(callbackContext, data);
-//     } else if (action.equals(CONNECT_NETWORK)) {
-//       this.connect(callbackContext, data);
-//     } else if (action.equals(DISCONNECT_NETWORK)) {
-//       this.disconnectNetwork(callbackContext, data);
-//     } else if (action.equals(LIST_NETWORKS)) {
-//       this.listNetworks(callbackContext);
-//     } else if (action.equals(START_SCAN)) {
-//       this.startScan(callbackContext);
-//     } else if (action.equals(GET_SCAN_RESULTS)) {
-//       this.getScanResults(callbackContext, data);
-//     } else if (action.equals(DISCONNECT)) {
-//       this.disconnect(callbackContext);
-//     } else if (action.equals(GET_CONNECTED_SSID)) {
-//       this.getConnectedSSID(callbackContext);
-//     } else if (action.equals(GET_CONNECTED_BSSID)) {
-//       this.getConnectedBSSID(callbackContext);
-//     } else if (action.equals(GET_CONNECTED_NETWORKID)) {
-//       this.getConnectedNetworkID(callbackContext);
-//     } else if (action.equals(RESET_BIND_ALL)) {
-//       this.resetBindAll(callbackContext);
-//     } else if (action.equals(SET_BIND_ALL)) {
-//       this.setBindAll(callbackContext);
-//     } else {
-//       callbackContext.error("Incorrect action parameter: " + action);
-//       // The ONLY time to return FALSE is when action does not exist that was called
-//       // Returning false results in an INVALID_ACTION error, which translates to an error callback invoked on the JavaScript side
-//       // All other errors should be handled with the fail callback (callbackContext.error)
-//       // @see https://cordova.apache.org/docs/en/latest/guide/platforms/android/plugin.html
-//       return false;
-//     }
-
-//     return true;
-//   }
-
-//   /**
-//    * Scans networks and sends the list back on the success callback
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @param data JSONArray with [0] == JSONObject
-//    * @return true
-//    */
-//   private boolean scan(final CallbackContext callbackContext, final JSONArray data) {
-//     Log.v(TAG, "Entering startScan");
-//     final ScanSyncContext syncContext = new ScanSyncContext();
-
-//     final BroadcastReceiver receiver = new BroadcastReceiver() {
-//       public void onReceive(Context context, Intent intent) {
-//         Log.v(TAG, "Entering onReceive");
-
-//         synchronized (syncContext) {
-//           if (syncContext.finished) {
-//             Log.v(TAG, "In onReceive, already finished");
-//             return;
-//           }
-//           syncContext.finished = true;
-//           context.unregisterReceiver(this);
-//         }
-
-//         Log.v(TAG, "In onReceive, success");
-//         getScanResults(callbackContext, data);
-//       }
-//     };
-
-//     final Context context = cordova.getActivity().getApplicationContext();
-
-//     Log.v(TAG, "Submitting timeout to threadpool");
-
-//     cordova.getThreadPool().submit(new Runnable() {
-
-//       public void run() {
-
-//         Log.v(TAG, "Entering timeout");
-
-//         final int TEN_SECONDS = 10000;
-
-//         try {
-//           Thread.sleep(TEN_SECONDS);
-//         } catch (InterruptedException e) {
-//           Log.e(TAG, "Received InterruptedException e, " + e);
-//           // keep going into error
-//         }
-
-//         Log.v(TAG, "Thread sleep done");
-
-//         synchronized (syncContext) {
-//           if (syncContext.finished) {
-//             Log.v(TAG, "In timeout, already finished");
-//             return;
-//           }
-//           syncContext.finished = true;
-//           context.unregisterReceiver(receiver);
-//         }
-
-//         Log.v(TAG, "In timeout, error");
-//         callbackContext.error("TIMEOUT_WAITING_FOR_SCAN");
-//       }
-
-//     });
-
-//     Log.v(TAG, "Registering broadcastReceiver");
-//     context.registerReceiver(
-//             receiver,
-//             new IntentFilter(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)
-//     );
-
-//     if (!wifiManager.startScan()) {
-//       Log.v(TAG, "Scan failed");
-//       callbackContext.error("SCAN_FAILED");
-//       return false;
-//     }
-
-//     Log.v(TAG, "Starting wifi scan");
-//     return true;
-//   }
-
-//   /**
-//    * This methods adds a network to the list of available WiFi networks. If the network already
-//    * exists, then it updates it.
-//    *
-//    * @return true    if add successful, false if add fails
-//    * @params callbackContext     A Cordova callback context.
-//    * @params data                JSON Array with [0] == SSID, [1] == password
-//    */
-//   private boolean add(CallbackContext callbackContext, JSONArray data) {
-
-//     Log.d(TAG, "WifiWizard2: add entered.");
-
-
-//     try {
-//       // data's order for ANY object is
-//       // 0: SSID
-//       // 1: authentication algorithm,
-//       // 2: authentication information
-//       // 3: whether or not the SSID is hidden
-//       String newSSID = data.getString(0);
-//       String newPass = data.getString(2);
-//       String authType = data.getString(1);
-//       boolean isHiddenSSID = data.getBoolean(3);
-
-//       if(API_VERSION >= 29){
-//         // Remove Double Quotes
-//         newSSID = newSSID.replace("\"", "");
-//         newPass = newPass.replace("\"", "");
-
-//         this.networkCallback = new ConnectivityManager.NetworkCallback() {
-//           @Override
-//           public void onAvailable(Network network) {
-//             connectivityManager.bindProcessToNetwork(network);
-//             Log.d(TAG, "onAvailable");
-//             callbackContext.success("onAvailable");
-//           }
-//           @Override
-//           public void onUnavailable() {
-//             super.onUnavailable();
-//             Log.d(TAG, "onUnavailable");
-//             callbackContext.error("onUnavailable");
-//           }
-//         };
-
-//         // Connect Wifi using WifiNetworkSpecifier
-//         WifiNetworkSpecifier.Builder builder = new WifiNetworkSpecifier.Builder();
-//         builder.setIsHiddenSsid(this.hiddenSSID);
-
-//         if (newSSID.endsWith("#")) {
-//           newSSID = newSSID.replace("#", "");
-//           builder.setSsidPattern(new PatternMatcher(newSSID, PatternMatcher.PATTERN_PREFIX));
-//         }else {
-//           builder.setSsid(newSSID);
-//         }
-//         builder.setWpa2Passphrase(newPass);
-
-//         WifiNetworkSpecifier wifiNetworkSpecifier = builder.build();
-
-//         NetworkRequest.Builder networkRequestBuilder1 = new NetworkRequest.Builder();
-//         networkRequestBuilder1.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
-//         //removeCapability added for hotspots without internet
-//         networkRequestBuilder1.removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
-//         networkRequestBuilder1.setNetworkSpecifier(wifiNetworkSpecifier);
-
-//         NetworkRequest nr = networkRequestBuilder1.build();
-//         //timeout add because "No devices found" wasn't handled correct and doesn't throw Unavailable
-//         connectivityManager.requestNetwork(nr, this.networkCallback, 30000);
-
-//       }else{
-
-//         // Initialize the WifiConfiguration object
-//         WifiConfiguration wifi = new WifiConfiguration();
-//         wifi.hiddenSSID = this.hiddenSSID;
-//         wifi.SSID = newSSID;
-//         wifi.preSharedKey = newPass;
-//         wifi.status = WifiConfiguration.Status.ENABLED;
-//         wifi.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.TKIP);
-//         wifi.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);
-//         wifi.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
-//         wifi.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.TKIP);
-//         wifi.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);
-//         wifi.allowedProtocols.set(WifiConfiguration.Protocol.RSN);
-//         wifi.allowedProtocols.set(WifiConfiguration.Protocol.WPA);
-
-//         wifi.networkId = ssidToNetworkId(newSSID);
-
-//         // Set network to highest priority (deprecated in API >= 26)
-//         if(API_VERSION < 26) {
-//           wifi.priority = getMaxWifiPriority(wifiManager) + 1;
-//         }
-
-//         // After processing authentication types, add or update network
-//         if(wifi.networkId == -1) { // -1 means SSID configuration does not exist yet
-
-//           int newNetId = wifiManager.addNetwork(wifi);
-//           if( newNetId > -1 ){
-//             callbackContext.success( newNetId );
-//           } else {
-//             callbackContext.error( "ERROR_ADDING_NETWORK" );
-//           }
-
-//         } else {
-
-//           int updatedNetID = wifiManager.updateNetwork(wifi);
-
-//           if(updatedNetID == -1)
-//             updatedNetID = wifiManager.addNetwork(wifi);
-
-//           if(updatedNetID > -1) {
-//             callbackContext.success( updatedNetID );
-//           } else {
-//             callbackContext.error("ERROR_UPDATING_NETWORK");
-//           }
-
-//         }
-
-//         // WifiManager configurations are presistent for API 26+
-//         if(API_VERSION < 26) {
-//           wifiManager.saveConfiguration(); // Call saveConfiguration for older < 26 API
-//         }
-//       }
-
-//       return true;
-
-
-//     } catch (Exception e) {
-//       callbackContext.error(e.getMessage());
-//       Log.d(TAG, e.getMessage());
-//       return false;
-//     }
-//   }
-
-//   /**
-//    * This method connects a network.
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @param data JSON Array, with [0] being SSID to connect
-//    */
-//   private void enable(CallbackContext callbackContext, JSONArray data) {
-//     Log.d(TAG, "WifiWizard2: enable entered.");
-
-//     if (!validateData(data)) {
-//       callbackContext.error("ENABLE_INVALID_DATA");
-//       Log.d(TAG, "WifiWizard2: enable invalid data.");
-//       return;
-//     }
-
-//     String ssidToEnable = "";
-//     String bindAll = "false";
-//     String waitForConnection = "false";
-
-//     try {
-//       ssidToEnable = data.getString(0);
-//       bindAll = data.getString(1);
-//       waitForConnection = data.getString(2);
-//     } catch (Exception e) {
-//       callbackContext.error(e.getMessage());
-//       Log.d(TAG, e.getMessage());
-//       return;
-//     }
-
-//     int networkIdToEnable = ssidToNetworkId(ssidToEnable);
-
-//     try {
-
-//       if(networkIdToEnable > -1) {
-
-//         Log.d(TAG, "Valid networkIdToEnable: attempting connection");
-
-//         // Bind all requests to WiFi network (only necessary for Lollipop+ - API 21+)
-//         if(bindAll.equals("true")) {
-//           registerBindALL(networkIdToEnable);
-//         }
-
-//         if(wifiManager.enableNetwork(networkIdToEnable, true)) {
-
-//           if( waitForConnection.equals("true") ){
-//             callbackContext.success("NETWORK_ENABLED");
-//             return;
-//           } else {
-//             new ConnectAsync().execute(callbackContext, networkIdToEnable);
-//             return;
-//           }
-
-//         } else {
-//           callbackContext.error("ERROR_ENABLING_NETWORK");
-//           return;
-//         }
-
-//       } else {
-//         callbackContext.error("UNABLE_TO_ENABLE");
-//         return;
-//       }
-
-//     } catch (Exception e) {
-//       callbackContext.error(e.getMessage());
-//       Log.d(TAG, e.getMessage());
-//       return;
-//     }
-
-//   }
-
-//   /**
-//    * This method disables a network.
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @param data JSON Array, with [0] being SSID to connect
-//    * @return true if network disconnected, false if failed
-//    */
-//   private boolean disable(CallbackContext callbackContext, JSONArray data) {
-//     Log.d(TAG, "WifiWizard2: disable entered.");
-
-//     if (!validateData(data)) {
-//       callbackContext.error("DISABLE_INVALID_DATA");
-//       Log.d(TAG, "WifiWizard2: disable invalid data");
-//       return false;
-//     }
-
-//     String ssidToDisable = "";
-
-//     try {
-//       ssidToDisable = data.getString(0);
-//     } catch (Exception e) {
-//       callbackContext.error(e.getMessage());
-//       Log.d(TAG, e.getMessage());
-//       return false;
-//     }
-
-//     int networkIdToDisconnect = ssidToNetworkId(ssidToDisable);
-
-//     try {
-
-//       if (networkIdToDisconnect > 0) {
-//         if(wifiManager.disableNetwork(networkIdToDisconnect)){
-//           maybeResetBindALL();
-//           callbackContext.success("Network " + ssidToDisable + " disabled!");
-//         } else {
-//           callbackContext.error("UNABLE_TO_DISABLE");
-//         }
-//         return true;
-//       } else {
-//         callbackContext.error("DISABLE_NETWORK_NOT_FOUND");
-//         Log.d(TAG, "WifiWizard2: Network not found to disable.");
-//         return false;
-//       }
-
-//     } catch (Exception e) {
-
-//       callbackContext.error(e.getMessage());
-//       Log.d(TAG, e.getMessage());
-//       return false;
-
-//     }
-//   }
-
-//   /**
-//    * This method removes a network from the list of configured networks.
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @param data JSON Array, with [0] being SSID to remove
-//    * @return true if network removed, false if failed
-//    */
-//   private boolean remove(CallbackContext callbackContext, JSONArray data) {
-//     Log.d(TAG, "WifiWizard2: remove entered.");
-
-//     if (!validateData(data)) {
-//       callbackContext.error("REMOVE_INVALID_DATA");
-//       Log.d(TAG, "WifiWizard2: remove data invalid");
-//       return false;
-//     }
-
-//     // TODO: Verify the type of data!
-//     try {
-//       String ssidToDisconnect = data.getString(0);
-
-//       if(API_VERSION >= 29){
-//         if (networkCallback != null) {
-//           connectivityManager.unregisterNetworkCallback(networkCallback);
-//           networkCallback = null;
-//         }
-//         connectivityManager.releaseNetworkRequest(pending_intent_net_req_received);
-// //        WifiNetworkSuggestion wifiNetworkSuggestion = new WifiNetworkSuggestion.Builder()
-// //                .setSsid(ssidToDisconnect)
-// //                .build();
-// //        List<WifiNetworkSuggestion> list = new ArrayList();
-// //        list.add(wifiNetworkSuggestion);
-// //        wifiManager.removeNetworkSuggestions(list);
-//         callbackContext.success("NETWORK_REMOVED");
-//         return true;
-//       }
-
-
-//       int networkIdToRemove = ssidToNetworkId(ssidToDisconnect);
-
-//       if (networkIdToRemove > -1) {
-
-//         if( wifiManager.removeNetwork(networkIdToRemove) ){
-
-//           // Configurations persist by default in API 26+
-//           if (API_VERSION < 26) {
-//             wifiManager.saveConfiguration();
-//           }
-
-//           callbackContext.success("NETWORK_REMOVED");
-
-//         } else {
-
-//           callbackContext.error( "UNABLE_TO_REMOVE" );
-//         }
-
-//         return true;
-//       } else {
-//         callbackContext.error("REMOVE_NETWORK_NOT_FOUND");
-//         Log.d(TAG, "WifiWizard2: Network not found, can't remove.");
-//         return false;
-//       }
-//     } catch (Exception e) {
-//       callbackContext.error(e.getMessage());
-//       Log.d(TAG, e.getMessage());
-//       return false;
-//     }
-//   }
-
-//   /**
-//    * This method connects a network.
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @param data JSON Array, with [0] being SSID to connect
-//    */
-//   private void connect(CallbackContext callbackContext, JSONArray data) {
-//     Log.d(TAG, "WifiWizard2: connect entered.");
-
-//     if(API_VERSION >= 29){
-//       // No need to connect, its already connected via WifiNetworkSpecifier at add(...) method
-//       callbackContext.success("NETWORK_CONNECTION_COMPLETED");
-//       return;
-//     }
-
-//     if (!validateData(data)) {
-//       callbackContext.error("CONNECT_INVALID_DATA");
-//       Log.d(TAG, "WifiWizard2: connect invalid data.");
-//       return;
-//     }
-
-//     String ssidToConnect = "";
-//     String bindAll = "false";
-
-//     try {
-//       ssidToConnect = data.getString(0);
-//       bindAll = data.getString(1);
-//     } catch (Exception e) {
-//       callbackContext.error(e.getMessage());
-//       Log.d(TAG, e.getMessage());
-//       return;
-//     }
-
-//     int networkIdToConnect = ssidToNetworkId(ssidToConnect);
-
-//     if (networkIdToConnect > -1) {
-//       // We disable the network before connecting, because if this was the last connection before
-//       // a disconnect(), this will not reconnect.
-
-//       Log.d(TAG, "Valid networkIdToConnect: attempting connection");
-
-//       // Bind all requests to WiFi network (only necessary for Lollipop+ - API 21+)
-//       if( bindAll.equals("true") ){
-//         registerBindALL(networkIdToConnect);
-//       }
-
-//       if (API_VERSION >= 26) {
-// //                wifiManager.disconnect();
-//       } else {
-//         wifiManager.disableNetwork(networkIdToConnect);
-//       }
-
-//       wifiManager.enableNetwork(networkIdToConnect, true);
-
-//       if (API_VERSION >= 26) {
-// //        wifiManager.reassociate();
-//       }
-
-//       new ConnectAsync().execute(callbackContext, networkIdToConnect);
-//       return;
-
-//     } else {
-//       callbackContext.error("INVALID_NETWORK_ID_TO_CONNECT");
-//       return;
-//     }
-//   }
-
-//   /**
-//    * Wait for connection before returning error or success
-//    *
-//    * This method will wait up to 60 seconds for WiFi connection to specified network ID be in COMPLETED state, otherwise will return error.
-//    *
-//    * @param callbackContext
-//    * @param networkIdToConnect
-//    * @return
-//    */
-//   private class ConnectAsync extends AsyncTask<Object, Void, String[]> {
-//     CallbackContext callbackContext;
-//     @Override
-//     protected void onPostExecute(String[] results) {
-//       String error = results[0];
-//       String success = results[1];
-//       if (error != null) {
-//         this.callbackContext.error(error);
-//       } else {
-//         this.callbackContext.success(success);
-//       }
-//     }
-
-//     @Override
-//     protected String[] doInBackground(Object... params) {
-//       this.callbackContext = (CallbackContext) params[0];
-//       int networkIdToConnect = (Integer) params[1];
-
-//       final int TIMES_TO_RETRY = 15;
-//       for (int i = 0; i < TIMES_TO_RETRY; i++) {
-
-//         WifiInfo info = wifiManager.getConnectionInfo();
-//         NetworkInfo.DetailedState connectionState = info
-//                 .getDetailedStateOf(info.getSupplicantState());
-
-//         boolean isConnected =
-//                 // need to ensure we're on correct network because sometimes this code is
-//                 // reached before the initial network has disconnected
-//                 info.getNetworkId() == networkIdToConnect && (
-//                         connectionState == NetworkInfo.DetailedState.CONNECTED ||
-//                                 // Android seems to sometimes get stuck in OBTAINING_IPADDR after it has received one
-//                                 (connectionState == NetworkInfo.DetailedState.OBTAINING_IPADDR
-//                                         && info.getIpAddress() != 0)
-//                 );
-
-//         if (isConnected) {
-//           return new String[]{ null, "NETWORK_CONNECTION_COMPLETED" };
-//         }
-
-//         Log.d(TAG, "WifiWizard: Got " + connectionState.name() + " on " + (i + 1) + " out of " + TIMES_TO_RETRY);
-//         final int ONE_SECOND = 1000;
-
-//         try {
-//           Thread.sleep(ONE_SECOND);
-//         } catch (InterruptedException e) {
-//           Log.e(TAG, e.getMessage());
-//           return new String[]{ "INTERRUPT_EXCEPT_WHILE_CONNECTING", null };
-//         }
-//       }
-//       Log.d(TAG, "WifiWizard: Network failed to finish connecting within the timeout");
-//       return new String[]{ "CONNECT_FAILED_TIMEOUT", null };
-//     }
-//   }
-
-//   /**
-//    * This method disconnects a network.
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @param data JSON Array, with [0] being SSID to connect
-//    * @return true if network disconnected, false if failed
-//    */
-//   private boolean disconnectNetwork(CallbackContext callbackContext, JSONArray data) {
-//     Log.d(TAG, "WifiWizard2: disconnectNetwork entered.");
-//     if (!validateData(data)) {
-//       callbackContext.error("DISCONNECT_NET_INVALID_DATA");
-//       Log.d(TAG, "WifiWizard2: disconnectNetwork invalid data");
-//       return false;
-//     }
-
-//     String ssidToDisconnect = "";
-
-//     // TODO: Verify type of data here!
-//     try {
-//       ssidToDisconnect = data.getString(0);
-//     } catch (Exception e) {
-//       callbackContext.error(e.getMessage());
-//       Log.d(TAG, e.getMessage());
-//       return false;
-//     }
-
-//     if(API_VERSION < 29){
-//       int networkIdToDisconnect = ssidToNetworkId(ssidToDisconnect);
-
-//       if(networkIdToDisconnect > 0) {
-
-//         if(wifiManager.disableNetwork(networkIdToDisconnect)) {
-
-//           maybeResetBindALL();
-
-//           // We also remove the configuration from the device (use "disable" to keep config)
-//           if( wifiManager.removeNetwork(networkIdToDisconnect) ){
-//             callbackContext.success("Network " + ssidToDisconnect + " disconnected and removed!");
-//           } else {
-//             callbackContext.error("DISCONNECT_NET_REMOVE_ERROR");
-//             Log.d(TAG, "WifiWizard2: Unable to remove network!");
-//             return false;
-//           }
-
-//         } else {
-//           callbackContext.error("DISCONNECT_NET_DISABLE_ERROR");
-//           Log.d(TAG, "WifiWizard2: Unable to disable network!");
-//           return false;
-//         }
-
-//         return true;
-//       } else {
-//         callbackContext.error("DISCONNECT_NET_ID_NOT_FOUND");
-//         Log.d(TAG, "WifiWizard2: Network not found to disconnect.");
-//         return false;
-//       }
-//     } else {
-//       try{
-//         ConnectivityManager cm = (ConnectivityManager) cordova.getActivity().getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
-//         cm.unregisterNetworkCallback(this.networkCallback);
-//         connectivityManager.bindProcessToNetwork(null);
-//         return true;
-//       }
-//       catch(Exception e) {
-//         callbackContext.error(e.getMessage());
-//         return false;
-//       }
-//     }
-//   }
-
-//   /**
-//    * This method disconnects the currently connected network.
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @return true if network disconnected, false if failed
-//    */
-//   private boolean disconnect(CallbackContext callbackContext) {
-//     Log.d(TAG, "WifiWizard2: disconnect entered.");
-
-//     if (wifiManager.disconnect()) {
-//       maybeResetBindALL();
-//       callbackContext.success("Disconnected from current network");
-//       return true;
-//     } else {
-//       callbackContext.error("ERROR_DISCONNECT");
-//       return false;
-//     }
-//   }
-
-//   /**
-//    * Reconnect Network
-//    * <p>
-//    * Reconnect to the currently active access point, if we are currently disconnected. This may
-//    * result in the asynchronous delivery of state change events.
-//    */
-//   private boolean reconnect(CallbackContext callbackContext) {
-//     Log.d(TAG, "WifiWizard2: reconnect entered.");
-
-//     if (wifiManager.reconnect()) {
-//       callbackContext.success("Reconnected network");
-//       return true;
-//     } else {
-//       callbackContext.error("ERROR_RECONNECT");
-//       return false;
-//     }
-//   }
-
-//   /**
-//    * Reassociate Network
-//    * <p>
-//    * Reconnect to the currently active access point, even if we are already connected. This may
-//    * result in the asynchronous delivery of state change events.
-//    */
-//   private boolean reassociate(CallbackContext callbackContext) {
-//     Log.d(TAG, "WifiWizard2: reassociate entered.");
-
-//     if (wifiManager.reassociate()) {
-//       callbackContext.success("Reassociated network");
-//       return true;
-//     } else {
-//       callbackContext.error("ERROR_REASSOCIATE");
-//       return false;
-//     }
-//   }
-
-//   /**
-//    * This method uses the callbackContext.success method to send a JSONArray of the currently
-//    * configured networks.
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @return true if network disconnected, false if failed
-//    */
-//   private boolean listNetworks(CallbackContext callbackContext) {
-//     Log.d(TAG, "WifiWizard2: listNetworks entered.");
-//     @SuppressLint("MissingPermission") List<WifiConfiguration> wifiList = wifiManager.getConfiguredNetworks();
-
-//     JSONArray returnList = new JSONArray();
-
-//     for (WifiConfiguration wifi : wifiList) {
-//       returnList.put(wifi.SSID);
-//     }
-
-//     callbackContext.success(returnList);
-
-//     return true;
-//   }
-
-//   /**
-//    * This method uses the callbackContext.success method to send a JSONArray of the scanned
-//    * networks.
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @param data JSONArray with [0] == JSONObject
-//    * @return true
-//    */
-//   private boolean getScanResults(CallbackContext callbackContext, JSONArray data) {
-
-//     if (cordova.hasPermission(ACCESS_FINE_LOCATION)) {
-
-//       List<ScanResult> scanResults = wifiManager.getScanResults();
-
-//       JSONArray returnList = new JSONArray();
-
-//       Integer numLevels = null;
-
-//       if (!validateData(data)) {
-//         callbackContext.error("GET_SCAN_RESULTS_INVALID_DATA");
-//         Log.d(TAG, "WifiWizard2: getScanResults invalid data");
-//         return false;
-//       } else if (!data.isNull(0)) {
-//         try {
-//           JSONObject options = data.getJSONObject(0);
-
-//           if (options.has("numLevels")) {
-//             Integer levels = options.optInt("numLevels");
-
-//             if (levels > 0) {
-//               numLevels = levels;
-//             } else if (options.optBoolean("numLevels", false)) {
-//               // use previous default for {numLevels: true}
-//               numLevels = 5;
-//             }
-//           }
-//         } catch (JSONException e) {
-//           e.printStackTrace();
-//           callbackContext.error(e.toString());
-//           return false;
-//         }
-//       }
-
-//       for (ScanResult scan : scanResults) {
-//         /*
-//          * @todo - breaking change, remove this notice when tidying new release and explain changes, e.g.:
-//          *   0.y.z includes a breaking change to WifiWizard2.getScanResults().
-//          *   Earlier versions set scans' level attributes to a number derived from wifiManager.calculateSignalLevel.
-//          *   This update returns scans' raw RSSI value as the level, per Android spec / APIs.
-//          *   If your application depends on the previous behaviour, we have added an options object that will modify behaviour:
-//          *   - if `(n == true || n < 2)`, `*.getScanResults({numLevels: n})` will return data as before, split in 5 levels;
-//          *   - if `(n > 1)`, `*.getScanResults({numLevels: n})` will calculate the signal level, split in n levels;
-//          *   - if `(n == false)`, `*.getScanResults({numLevels: n})` will use the raw signal level;
-//          */
-
-//         int level;
-
-//         if (numLevels == null) {
-//           level = scan.level;
-//         } else {
-//           level = wifiManager.calculateSignalLevel(scan.level, numLevels);
-//         }
-
-//         JSONObject lvl = new JSONObject();
-//         try {
-//           lvl.put("level", level);
-//           lvl.put("SSID", scan.SSID);
-//           lvl.put("BSSID", scan.BSSID);
-//           lvl.put("frequency", scan.frequency);
-//           lvl.put("capabilities", scan.capabilities);
-//           lvl.put("timestamp", scan.timestamp);
-
-//           if (API_VERSION >= 23) { // Marshmallow
-//             lvl.put("channelWidth", scan.channelWidth);
-//             lvl.put("centerFreq0", scan.centerFreq0);
-//             lvl.put("centerFreq1", scan.centerFreq1);
-//           } else {
-//             lvl.put("channelWidth", JSONObject.NULL);
-//             lvl.put("centerFreq0", JSONObject.NULL);
-//             lvl.put("centerFreq1", JSONObject.NULL);
-//           }
-
-//           returnList.put(lvl);
-//         } catch (JSONException e) {
-//           e.printStackTrace();
-//           callbackContext.error(e.toString());
-//           return false;
-//         }
-//       }
-
-//       callbackContext.success(returnList);
-//       return true;
-
-//     } else {
-
-//       requestLocationPermission(SCAN_RESULTS_CODE);
-//       return true;
-//     }
-
-//   }
-
-//   /**
-//    * This method uses the callbackContext.success method. It starts a wifi scanning
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @return true if started was successful
-//    */
-//   private boolean startScan(CallbackContext callbackContext) {
-
-//     if (wifiManager.startScan()) {
-//       callbackContext.success();
-//       return true;
-//     } else {
-//       callbackContext.error("STARTSCAN_FAILED");
-//       return false;
-//     }
-//   }
-
-//   /**
-//    * This method returns the connected WiFi network ID (if connected)
-//    *
-//    * @return -1 if no network connected, or network id if connected
-//    */
-//   private int getConnectedNetId() {
-//     int networkId = -1;
-
-//     WifiInfo info = wifiManager.getConnectionInfo();
-
-//     if (info == null) {
-//       Log.d(TAG, "Unable to read wifi info");
-//       return networkId;
-//     }
-
-//     networkId = info.getNetworkId();
-
-//     if (networkId == -1) {
-//       Log.d(TAG, "NO_CURRENT_NETWORK_FOUND");
-//     }
-
-//     return networkId;
-//   }
-
-//   /**
-//    * Get Network ID from SSID
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @param data JSON Array, with [0] being SSID to connect
-//    * @return true if network connected, false if failed
-//    */
-//   private boolean getSSIDNetworkID(CallbackContext callbackContext, JSONArray data) {
-//     Log.d(TAG, "WifiWizard2: getSSIDNetworkID entered.");
-
-//     if (!validateData(data)) {
-//       callbackContext.error("GET_SSID_INVALID_DATA");
-//       Log.d(TAG, "WifiWizard2: getSSIDNetworkID invalid data.");
-//       return false;
-//     }
-
-//     String ssidToGetNetworkID = "";
-
-//     try {
-//       ssidToGetNetworkID = data.getString(0);
-//     } catch (Exception e) {
-//       callbackContext.error(e.getMessage());
-//       Log.d(TAG, e.getMessage());
-//       return false;
-//     }
-
-//     int networkIdToConnect = ssidToNetworkId(ssidToGetNetworkID);
-//     callbackContext.success(networkIdToConnect);
-
-//     return true;
-//   }
-
-//   /**
-//    * This method returns the connected WiFi network ID (if connected)
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @return -1 if no network connected, or network id if connected
-//    */
-//   private boolean getConnectedNetworkID(CallbackContext callbackContext) {
-//     int networkId = getConnectedNetId();
-
-//     if (networkId == -1) {
-//       callbackContext.error("GET_CONNECTED_NET_ID_ERROR");
-//       return false;
-//     }
-
-//     callbackContext.success(networkId);
-//     return true;
-//   }
-
-//   /**
-//    * This method retrieves the SSID for the currently connected network
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @return true if SSID found, false if not.
-//    */
-//   private boolean getConnectedSSID(CallbackContext callbackContext) {
-//     return getWifiServiceInfo(callbackContext, false);
-//   }
-
-//   /**
-//    * This method retrieves the BSSID for the currently connected network
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @return true if SSID found, false if not.
-//    */
-//   private boolean getConnectedBSSID(CallbackContext callbackContext) {
-//     return getWifiServiceInfo(callbackContext, true);
-//   }
-
-//   /**
-//    * This method retrieves the WifiInformation for the (SSID or BSSID) currently connected network.
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @param basicIdentifier A flag to get BSSID if true or SSID if false.
-//    * @return true if SSID found, false if not.
-//    */
-//   private boolean getWifiServiceInfo(CallbackContext callbackContext, boolean basicIdentifier) {
-//     if (API_VERSION >= 23 && !cordova.hasPermission(ACCESS_FINE_LOCATION)) { //Android 9 (Pie) or newer
-//       requestLocationPermission(WIFI_SERVICE_INFO_CODE);
-//       bssidRequested = basicIdentifier;
-//       return true;
-//     } else {
-//       WifiInfo info = wifiManager.getConnectionInfo();
-
-//       if (info == null) {
-//         callbackContext.error("UNABLE_TO_READ_WIFI_INFO");
-//         return false;
-//       }
-
-//       // Only return SSID or BSSID when actually connected to a network
-//       SupplicantState state = info.getSupplicantState();
-//       if (!state.equals(SupplicantState.COMPLETED)) {
-//         callbackContext.error("CONNECTION_NOT_COMPLETED");
-//         return false;
-//       }
-
-//       String serviceInfo;
-//       if (basicIdentifier) {
-//         serviceInfo = info.getBSSID();
-//       } else {
-//         serviceInfo = info.getSSID();
-//       }
-
-//       if (serviceInfo == null || serviceInfo.isEmpty() || serviceInfo == "0x") {
-//         callbackContext.error("WIFI_INFORMATION_EMPTY");
-//         return false;
-//       }
-
-//       // http://developer.android.com/reference/android/net/wifi/WifiInfo.html#getSSID()
-//       if (serviceInfo.startsWith("\"") && serviceInfo.endsWith("\"")) {
-//         serviceInfo = serviceInfo.substring(1, serviceInfo.length() - 1);
-//       }
-
-//       callbackContext.success(serviceInfo);
-//       return true;
-//     }
-//   }
-
-//   /**
-//    * This method retrieves the current WiFi status
-//    *
-//    * @param callbackContext A Cordova callback context
-//    * @return true if WiFi is enabled, fail will be called if not.
-//    */
-//   private boolean isWifiEnabled(CallbackContext callbackContext) {
-//     boolean isEnabled = wifiManager.isWifiEnabled();
-//     callbackContext.success(isEnabled ? "1" : "0");
-//     return isEnabled;
-//   }
-
-//   /**
-//    * This method takes a given String, searches the current list of configured WiFi networks, and
-//    * returns the networkId for the network if the SSID matches. If not, it returns -1.
-//    */
-//   private int ssidToNetworkId(String ssid) {
-
-//     try {
-
-//       int maybeNetId = Integer.parseInt(ssid);
-//       Log.d(TAG, "ssidToNetworkId passed SSID is integer, probably a Network ID: " + ssid);
-//       return maybeNetId;
-
-//     } catch (NumberFormatException e) {
-
-//       List<WifiConfiguration> currentNetworks = wifiManager.getConfiguredNetworks();
-//       int networkId = -1;
-
-//       // For each network in the list, compare the SSID with the given one
-//       for (WifiConfiguration test : currentNetworks) {
-//         if (test.SSID != null && test.SSID.equals(ssid)) {
-//           networkId = test.networkId;
-//         }
-//       }
-
-//       return networkId;
-
-//     }
-//   }
-
-//   /**
-//    * This method enables or disables the wifi
-//    */
-//   private boolean setWifiEnabled(CallbackContext callbackContext, JSONArray data) {
-//     if (!validateData(data)) {
-//       callbackContext.error("SETWIFIENABLED_INVALID_DATA");
-//       Log.d(TAG, "WifiWizard2: setWifiEnabled invalid data");
-//       return false;
-//     }
-
-//     String status = "";
-
-//     try {
-//       status = data.getString(0);
-//     } catch (Exception e) {
-//       callbackContext.error(e.getMessage());
-//       Log.d(TAG, e.getMessage());
-//       return false;
-//     }
-
-//     if (wifiManager.setWifiEnabled(status.equals("true"))) {
-//       callbackContext.success();
-//       return true;
-//     } else {
-//       callbackContext.error("ERROR_SETWIFIENABLED");
-//       return false;
-//     }
-//   }
-
-//   /**
-//    * This method will check if WiFi is enabled, and enable it if not, waiting up to 10 seconds for
-//    * it to enable
-//    *
-//    * @return True if wifi is enabled, false if unable to enable wifi
-//    */
-//   private boolean verifyWifiEnabled() {
-
-//     Log.d(TAG, "WifiWizard2: verifyWifiEnabled entered.");
-
-//     if (!wifiManager.isWifiEnabled()) {
-
-//       Log.i(TAG, "Enabling wi-fi...");
-
-//       if (wifiManager.setWifiEnabled(true)) {
-//         Log.i(TAG, "Wi-fi enabled");
-//       } else {
-//         Log.e(TAG, "VERIFY_ERROR_ENABLE_WIFI");
-//         return false;
-//       }
-
-//       // This happens very quickly, but need to wait for it to enable. A little busy wait?
-//       int count = 0;
-
-//       while (!wifiManager.isWifiEnabled()) {
-//         if (count >= 10) {
-//           Log.i(TAG, "Took too long to enable wi-fi, quitting");
-//           return false;
-//         }
-
-//         Log.i(TAG, "Still waiting for wi-fi to enable...");
-
-//         try {
-//           Thread.sleep(1000L);
-//         } catch (InterruptedException ie) {
-//           // continue
-//         }
-
-//         count++;
-//       }
-
-//       // If we make it this far, wifi should be enabled by now
-//       return true;
-
-//     } else {
-
-//       return true;
-
-//     }
-
-//   }
-
-//   /**
-//    * Format and return WiFi IPv4 Address
-//    * @return
-//    */
-//   private String[] getWiFiIPAddress() {
-//     WifiInfo wifiInfo = wifiManager.getConnectionInfo();
-//     int ip = wifiInfo.getIpAddress();
-
-//     String ipString = formatIP(ip);
-//     String subnet = "";
-
-//     try {
-//       InetAddress inetAddress = InetAddress.getByName(ipString);
-//       subnet = getIPv4Subnet(inetAddress);
-//     } catch (Exception e) {
-//     }
-
-//     return new String[]{ipString, subnet};
-//   }
-
-//   /**
-//    * Get WiFi Router IP from DHCP
-//    * @return
-//    */
-//   private String getWiFiRouterIP() {
-//     DhcpInfo dhcp = wifiManager.getDhcpInfo();
-//     int ip = dhcp.gateway;
-//     return formatIP(ip);
-//   }
-
-//   /**
-//    * Format IPv4 Address
-//    * @param ip
-//    * @return
-//    */
-//   private String formatIP(int ip) {
-//     return String.format(
-//             "%d.%d.%d.%d",
-//             (ip & 0xff),
-//             (ip >> 8 & 0xff),
-//             (ip >> 16 & 0xff),
-//             (ip >> 24 & 0xff)
-//     );
-//   }
-
-//   /**
-//    * Get IPv4 Subnet
-//    * @param inetAddress
-//    * @return
-//    */
-//   public static String getIPv4Subnet(InetAddress inetAddress) {
-//     try {
-//       NetworkInterface ni = NetworkInterface.getByInetAddress(inetAddress);
-//       List<InterfaceAddress> intAddrs = ni.getInterfaceAddresses();
-//       for (InterfaceAddress ia : intAddrs) {
-//         if (!ia.getAddress().isLoopbackAddress() && ia.getAddress() instanceof Inet4Address) {
-//           return getIPv4SubnetFromNetPrefixLength(ia.getNetworkPrefixLength()).getHostAddress()
-//                   .toString();
-//         }
-//       }
-//     } catch (Exception e) {
-//     }
-//     return "";
-//   }
-
-//   /**
-//    * Get Subnet from Prefix Length
-//    * @param netPrefixLength
-//    * @return
-//    */
-//   public static InetAddress getIPv4SubnetFromNetPrefixLength(int netPrefixLength) {
-//     try {
-//       int shift = (1 << 31);
-//       for (int i = netPrefixLength - 1; i > 0; i--) {
-//         shift = (shift >> 1);
-//       }
-//       String subnet =
-//               Integer.toString((shift >> 24) & 255) + "." + Integer.toString((shift >> 16) & 255) + "."
-//                       + Integer.toString((shift >> 8) & 255) + "." + Integer.toString(shift & 255);
-//       return InetAddress.getByName(subnet);
-//     } catch (Exception e) {
-//     }
-//     return null;
-//   }
-
-//   /**
-//    * Validate JSON data
-//    */
-//   private boolean validateData(JSONArray data) {
-//     try {
-//       if (data == null || data.get(0) == null) {
-//         callbackContext.error("DATA_IS_NULL");
-//         return false;
-//       }
-//       return true;
-//     } catch (Exception e) {
-//       callbackContext.error(e.getMessage());
-//     }
-//     return false;
-//   }
-
-//   /**
-//    * Request ACCESS_FINE_LOCATION Permission
-//    * @param requestCode
-//    */
-//   protected void requestLocationPermission(int requestCode) {
-//     cordova.requestPermission(this, requestCode, ACCESS_FINE_LOCATION);
-//   }
-
-//   /**
-//    * Handle Android Permission Requests
-//    */
-//   public void onRequestPermissionResult(int requestCode, String[] permissions, int[] grantResults)
-//           throws JSONException {
-
-//     for (int r : grantResults) {
-//       if (r == PackageManager.PERMISSION_DENIED) {
-//         callbackContext.error( "PERMISSION_DENIED" );
-//         return;
-//       }
-//     }
-
-//     switch (requestCode) {
-//       case SCAN_RESULTS_CODE:
-//         getScanResults(callbackContext, passedData); // Call method again after permissions approved
-//         break;
-//       case SCAN_CODE:
-//         scan(callbackContext, passedData); // Call method again after permissions approved
-//         break;
-//       case LOCATION_REQUEST_CODE:
-//         callbackContext.success("PERMISSION_GRANTED");
-//         break;
-//       case WIFI_SERVICE_INFO_CODE:
-//         getWifiServiceInfo(callbackContext, bssidRequested);
-//         break;
-//     }
-//   }
-
-//   /**
-//    * Figure out what the highest priority network in the network list is and return that priority
-//    */
-//   private static int getMaxWifiPriority(final WifiManager wifiManager) {
-//     final List<WifiConfiguration> configurations = wifiManager.getConfiguredNetworks();
-//     int maxPriority = 0;
-//     for (WifiConfiguration config : configurations) {
-//       if (config.priority > maxPriority) {
-//         maxPriority = config.priority;
-//       }
-//     }
-
-//     Log.d(TAG, "WifiWizard: Found max WiFi priority of "
-//             + maxPriority);
-
-//     return maxPriority;
-//   }
-
-//   /**
-//    * Check if device is connected to Internet
-//    */
-//   private boolean canConnectToInternet(CallbackContext callbackContext, boolean doPing) {
-
-//     try {
-
-//       if ( hasInternetConnection(doPing) ) {
-//         // Send success as 1 to return true from Promise (handled in JS)
-//         callbackContext.success("1");
-//         return true;
-//       } else {
-//         callbackContext.success("0");
-//         return false;
-//       }
-
-//     } catch (Exception e) {
-//       callbackContext.error(e.getMessage());
-//       Log.d(TAG, e.getMessage());
-//       return false;
-//     }
-//   }
-
-//   /**
-//    * Check if we can conenct to router via HTTP connection
-//    *
-//    * @param callbackContext
-//    * @param doPing
-//    * @return boolean
-//    */
-//   private boolean canConnectToRouter(CallbackContext callbackContext, boolean doPing) {
-
-//     try {
-
-//       if (hasConnectionToRouter(doPing)) {
-//         // Send success as 1 to return true from Promise (handled in JS)
-//         callbackContext.success("1");
-//         return true;
-//       } else {
-//         callbackContext.success("0");
-//         return false;
-//       }
-
-//     } catch (Exception e) {
-//       callbackContext.error(e.getMessage());
-//       Log.d(TAG, e.getMessage());
-//       return false;
-//     }
-//   }
-
-//   /**
-//    * Check if The Device Is Connected to Internet
-//    *
-//    * @return true if device connect to Internet or return false if not
-//    */
-//   public boolean hasInternetConnection(boolean doPing) {
-//     if (connectivityManager != null) {
-//       NetworkInfo info = connectivityManager.getActiveNetworkInfo();
-//       if (info != null) {
-//         if (info.isConnected()) {
-//           if( doPing ){
-//             return pingCmd("8.8.8.8");
-//           } else {
-//             return isHTTPreachable("http://www.google.com/");
-//           }
-//         }
-//       }
-//     }
-//     return false;
-//   }
-
-//   /**
-//    * Check for connection to router by pinging router IP
-//    * @return
-//    */
-//   public boolean hasConnectionToRouter( boolean doPing ) {
-
-//     String ip = getWiFiRouterIP();
-
-//     if ( ip == null || ip.equals("0.0.0.0") || connectivityManager == null) {
-
-//       return false;
-
-//     } else {
-
-//       NetworkInfo info = connectivityManager.getActiveNetworkInfo();
-
-//       if (info != null && info.isConnected()) {
-
-//         if( doPing ){
-//           return pingCmd(ip);
-//         } else {
-//           return isHTTPreachable("http://" + ip + "/");
-//         }
-//       } else {
-//         return false;
-//       }
-
-//     }
-
-//   }
-
-//   /**
-//    * Check if HTTP connection to URL is reachable
-//    *
-//    * @param checkURL
-//    * @return boolean
-//    */
-//   public static boolean isHTTPreachable(String checkURL) {
-//     try {
-//       // make a URL to a known source
-//       URL url = new URL(checkURL);
-
-//       // open a connection to that source
-//       HttpURLConnection urlConnect = (HttpURLConnection) url.openConnection();
-
-//       // trying to retrieve data from the source. If there
-//       // is no connection, this line will fail
-//       Object objData = urlConnect.getContent();
-
-//     } catch (Exception e) {
-//       e.printStackTrace();
-//       return false;
-//     }
-
-//     return true;
-//   }
-
-//   /**
-//    * Method to Ping IP Address
-//    *
-//    * @param addr IP address you want to ping it
-//    * @return true if the IP address is reachable
-//    */
-//   public boolean pingCmd(String addr) {
-
-//     try {
-
-//       String ping = "ping  -c 1 -W 3 " + addr;
-//       Runtime run = Runtime.getRuntime();
-//       Process pro = run.exec(ping);
-
-//       try {
-//         pro.waitFor();
-//       } catch (InterruptedException e) {
-//         Log.e(TAG, "InterruptedException error.", e);
-//       }
-
-//       int exit = pro.exitValue();
-
-//       Log.d(TAG, "pingCmd exitValue" + exit);
-
-//       if (exit == 0) {
-//         return true;
-//       } else {
-//         // ip address is not reachable
-//         return false;
-//       }
-//     } catch (UnknownHostException e) {
-//       Log.d(TAG, "UnknownHostException: " + e.getMessage());
-//     } catch (Exception e) {
-//       Log.d(TAG, e.getMessage());
-//     }
-
-//     return false;
-//   }
-
-//   /**
-//    * Network Changed Broadcast Receiver
-//    */
-//   private class NetworkChangedReceiver extends BroadcastReceiver {
-
-//     @Override
-//     public void onReceive(final Context context, final Intent intent) {
-
-//       if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(intent.getAction())) {
-
-//         Log.d(TAG, "NETWORK_STATE_CHANGED_ACTION");
-
-//         NetworkInfo networkInfo = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
-//         WifiInfo info = WifiWizard2.this.wifiManager.getConnectionInfo();
-
-//         // Checks that you're connected to the desired network
-//         if (networkInfo.isConnected() && info.getNetworkId() > -1) {
-
-//           final String ssid = info.getSSID().replaceAll("\"", "");
-//           final String bssid = info.getBSSID();
-
-//           Log.d(TAG, "Connected to '" + ssid + "' @ " + bssid);
-
-//           // Verify the desired network ID is what we actually connected to
-//           if ( desired != null && info.getNetworkId() == desired.apId ) {
-//             onSuccessfulConnection();
-//           } else {
-//             Log.e(TAG, "Could not connect to the desired ssid: " + ssid);
-//           }
-
-//         }
-
-//       }
-
-//     }
-
-//   }
-
-//   /**
-//    * Register Receiver for Network Changed to handle BindALL
-//    * @param netID
-//    */
-//   private void registerBindALL(int netID){
-
-//     // Bind all requests to WiFi network (only necessary for Lollipop+ - API 21+)
-//     if( API_VERSION > 21 ){
-//       Log.d(TAG, "registerBindALL: registering net changed receiver");
-//       desired = new AP(netID,null,null);
-//       cordova.getActivity().getApplicationContext().registerReceiver(networkChangedReceiver, NETWORK_STATE_CHANGED_FILTER);
-//     } else {
-//       Log.d(TAG, "registerBindALL: API older than 21, bindall ignored.");
-//     }
-//   }
-
-//   /**
-//    * Maybe reset bind all after disconnect/disable
-//    *
-//    * This method unregisters the network changed receiver, as well as setting null for
-//    * bindProcessToNetwork or setProcessDefaultNetwork to prevent future sockets from application
-//    * being routed through Wifi.
-//    */
-//   private void maybeResetBindALL(){
-
-//     Log.d(TAG, "maybeResetBindALL");
-
-//     // desired should have a value if receiver is registered
-//     if( desired != null ){
-
-//       if( API_VERSION > 21 ){
-
-//         try {
-//           // Unregister net changed receiver -- should only be registered in API versions > 21
-//           cordova.getActivity().getApplicationContext().unregisterReceiver(networkChangedReceiver);
-//         } catch (Exception e) {}
-
-//       }
-
-//       // Lollipop OS or newer
-//       if ( API_VERSION >= 23 ) {
-//         connectivityManager.bindProcessToNetwork(null);
-//       } else if( API_VERSION >= 21 && API_VERSION < 23 ){
-//         connectivityManager.setProcessDefaultNetwork(null);
-//       }
-
-//       if ( API_VERSION > 21 && networkCallback != null) {
-
-//         try {
-//           // Same behavior as releaseNetworkRequest
-//           connectivityManager.unregisterNetworkCallback(networkCallback); // Added in API 21
-//         } catch (Exception e) {}
-//       }
-
-//       networkCallback = null;
-//       previous = null;
-//       desired = null;
-
-//     }
-
-//   }
-
-//   /**
-//    * Will un-bind to network (use Cellular network)
-//    *
-//    * @param callbackContext A Cordova callback context
-//    */
-//   private void resetBindAll(CallbackContext callbackContext) {
-//     Log.d(TAG, "WifiWizard2: resetBindALL");
-
-//     try {
-//       maybeResetBindALL();
-//       callbackContext.success("Successfully reset BindALL");
-//     } catch (Exception e) {
-//       Log.e(TAG, "InterruptedException error.", e);
-//       callbackContext.error("ERROR_NO_BIND_ALL");
-//     }
-//   }
-
-//   /**
-//    * Will bind to network (use Wifi network)
-//    *
-//    * @param callbackContext A Cordova callback context
-//    */
-//   private void setBindAll(CallbackContext callbackContext) {
-//     Log.d(TAG, "WifiWizard2: setBindALL");
-
-//     try {
-//       int networkId = getConnectedNetId();
-//       registerBindALL(networkId);
-//       callbackContext.success("Successfully bindAll to network");
-//     } catch (Exception e) {
-//       Log.e(TAG, "InterruptedException error.", e);
-//       callbackContext.error("ERROR_CANT_BIND_ALL");
-//     }
-//   }
-
-
-//   /**
-//    * Called after successful connection to WiFi when using BindAll feature
-//    *
-//    * This method is called by the NetworkChangedReceiver after network changed action, and confirming that we are in fact connected to wifi,
-//    * and the wifi we're connected to, is the correct network set in enable, or connect.
-//    */
-//   private void onSuccessfulConnection() {
-//     // On Lollipop+ the OS routes network requests through mobile data
-//     // when phone is attached to a wifi that doesn't have Internet connection
-//     // We use the ConnectivityManager to force bind all requests from our process
-//     // to the wifi without internet
-//     // see https://android-developers.googleblog.com/2016/07/connecting-your-app-to-wi-fi-device.html
-
-//     // Marshmallow OS or newer
-//     if ( API_VERSION >= 23 ) {
-
-//       Log.d(TAG, "BindALL onSuccessfulConnection API >= 23");
-
-//       // Marshmallow (API 23+) or newer uses bindProcessToNetwork
-//       final NetworkRequest request = new NetworkRequest.Builder()
-//               .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
-//               .removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) //removeCapability added for hotspots without internet
-//               .build();
-
-//       networkCallback = new ConnectivityManager.NetworkCallback() {
-//         @Override
-//         public void onAvailable(Network network) {
-//           if( connectivityManager.bindProcessToNetwork(network) ){
-//             Log.d(TAG, "bindProcessToNetwork TRUE onSuccessfulConnection");
-//           } else {
-//             Log.d(TAG, "bindProcessToNetwork FALSE onSuccessfulConnection");
-//           }
-//         }
-//       };
-
-//       connectivityManager.requestNetwork(request, networkCallback);
-
-//       // Only lollipop (API 21 && 22) use setProcessDefaultNetwork, API < 21 already does this by default
-//     } else if( API_VERSION >= 21 && API_VERSION < 23 ){
-
-//       Log.d(TAG, "BindALL onSuccessfulConnection API >= 21 && < 23");
-
-//       // Lollipop (API 21-22) use setProcessDefaultNetwork (deprecated in API 23 - Marshmallow)
-//       final NetworkRequest request = new NetworkRequest.Builder()
-//               .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
-//               .removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) //removeCapability addded for hotspots without internet
-//               .build();
-
-//       networkCallback = new ConnectivityManager.NetworkCallback() {
-//         @Override
-//         public void onAvailable(Network network) {
-//           connectivityManager.setProcessDefaultNetwork(network);
-//         }
-//       };
-
-//       connectivityManager.requestNetwork(request, networkCallback);
-
-//     } else {
-//       // Technically we should never reach this with older API, but just in case
-//       Log.d(TAG, "BindALL onSuccessfulConnection API older than 21, no need to do any binding");
-//       networkCallback = null;
-//       previous = null;
-//       desired = null;
-
-//     }
-//   }
-
-//   /**
-//    * Class to store finished boolean in
-//    */
-//   private class ScanSyncContext {
-
-//     public boolean finished = false;
-//   }
-
-//   /**
-//    * Used for storing access point information
-//    */
-//   private static class AP {
-//     final String ssid, bssid;
-//     final int apId;
-
-//     AP(int apId, final String ssid, final String bssid) {
-//       this.apId = apId;
-//       this.ssid = ssid;
-//       this.bssid = bssid;
-//     }
-
-//   }
-// }
\ No newline at end of file
diff --git a/app document/CS/Android/google-services.json b/app document/CS/Android/google-services.json
deleted file mode 100644
index 62fbaeae..00000000
--- a/app document/CS/Android/google-services.json	
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "project_info": {
-    "project_number": "679409052782",
-    "firebase_url": "https://mohemm-dce93.firebaseio.com",
-    "project_id": "mohemm-dce93",
-    "storage_bucket": "mohemm-dce93.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:679409052782:android:dba155ac0859d7fea78a7f",
-        "android_client_info": {
-          "package_name": "hmg.cloudSolutions.mohem"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "679409052782-mtd6d8rjltucnm9uatn6g7et08sm6lbv.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyDgWjuSBIKGghWxYg_KGBRIZTi-O_UA8mU"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "679409052782-mtd6d8rjltucnm9uatn6g7et08sm6lbv.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/app document/CS/IOS/google-services.json b/app document/CS/IOS/google-services.json
deleted file mode 100644
index 9fdb04b8..00000000
--- a/app document/CS/IOS/google-services.json	
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "project_info": {
-    "project_number": "608631731238",
-    "firebase_url": "https://mohemm-cs.firebaseio.com",
-    "project_id": "mohemm-cs",
-    "storage_bucket": "mohemm-cs.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:608631731238:android:3a8384007f8700ec",
-        "android_client_info": {
-          "package_name": "com.cloudsolutions.mohemm"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "608631731238-83a5qndedia496ssa6ekkd3db5jo8khr.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyB5zpz9vC2NOxsU1dPr0TK0dVaMY5D4Mjg"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "608631731238-83a5qndedia496ssa6ekkd3db5jo8khr.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/app document/HMG/google-services.json b/app document/HMG/google-services.json
deleted file mode 100644
index 4dfaa0d3..00000000
--- a/app document/HMG/google-services.json	
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "project_info": {
-    "project_number": "448880075189",
-    "firebase_url": "https://al-habib-mohemm.firebaseio.com",
-    "project_id": "al-habib-mohemm",
-    "storage_bucket": "al-habib-mohemm.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:448880075189:android:5bb4821d515a826d88b9fc",
-        "android_client_info": {
-          "package_name": "com.cloudsolutions.alhabibmohemm"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "448880075189-49hc2l78pr9hsmr9p3k7j411r40diej8.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyC8nrli7eyuRNow8nF-QHvDMOxqUkj6fEw"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "448880075189-49hc2l78pr9hsmr9p3k7j411r40diej8.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/.DS_Store b/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/.DS_Store
deleted file mode 100644
index ff88d06d..00000000
Binary files a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/.DS_Store and /dev/null differ
diff --git a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/.DS_Store b/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/.DS_Store
deleted file mode 100644
index 841515fe..00000000
Binary files a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/.DS_Store and /dev/null differ
diff --git a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/AL HABIB MOHEMM DEVELOPMENT SSL CERTIFICATE/.DS_Store b/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/AL HABIB MOHEMM DEVELOPMENT SSL CERTIFICATE/.DS_Store
deleted file mode 100644
index d02ecfa5..00000000
Binary files a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/AL HABIB MOHEMM DEVELOPMENT SSL CERTIFICATE/.DS_Store and /dev/null differ
diff --git a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/AL HABIB MOHEMM DEVELOPMENT SSL CERTIFICATE/PUSH NOTIFICATIONS/.DS_Store b/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/AL HABIB MOHEMM DEVELOPMENT SSL CERTIFICATE/PUSH NOTIFICATIONS/.DS_Store
deleted file mode 100644
index dbcf9a1f..00000000
Binary files a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/AL HABIB MOHEMM DEVELOPMENT SSL CERTIFICATE/PUSH NOTIFICATIONS/.DS_Store and /dev/null differ
diff --git a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/AL HABIB MOHEMM DEVELOPMENT SSL CERTIFICATE/PUSH NOTIFICATIONS/AuthKey_W3CF7M96TP.p8 b/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/AL HABIB MOHEMM DEVELOPMENT SSL CERTIFICATE/PUSH NOTIFICATIONS/AuthKey_W3CF7M96TP.p8
deleted file mode 100644
index dfbb576a..00000000
--- a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/AL HABIB MOHEMM DEVELOPMENT SSL CERTIFICATE/PUSH NOTIFICATIONS/AuthKey_W3CF7M96TP.p8	
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgpFHLFUMeYsa60Ljq
-iLNjrd5vW54LWW29shqYplVrbJGgCgYIKoZIzj0DAQehRANCAATtOB42ERmP9URQ
-ERKOSOsNs84YYhYOYgJWzEl8vawi4mUI2MaliCdXkTxzqChTWuPw2YN4n1ebAclM
-GEIcObMj
------END PRIVATE KEY-----
\ No newline at end of file
diff --git a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/GOOGLE SERVICES/.DS_Store b/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/GOOGLE SERVICES/.DS_Store
deleted file mode 100644
index 5008ddfc..00000000
Binary files a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/GOOGLE SERVICES/.DS_Store and /dev/null differ
diff --git a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/GOOGLE SERVICES/GoogleService-Info.plist b/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/GOOGLE SERVICES/GoogleService-Info.plist
deleted file mode 100644
index 61e37a83..00000000
--- a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/GOOGLE SERVICES/GoogleService-Info.plist	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CLIENT_ID</key>
-	<string>448880075189-tcgggmh2ua9tsmdr97c1ttcgrmf5kg5m.apps.googleusercontent.com</string>
-	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.448880075189-tcgggmh2ua9tsmdr97c1ttcgrmf5kg5m</string>
-	<key>API_KEY</key>
-	<string>AIzaSyB--KUTUYVpcdxpETCEsdhKs5cV3QawW7Q</string>
-	<key>GCM_SENDER_ID</key>
-	<string>448880075189</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.cloudsolutions.alhabibmohemm</string>
-	<key>PROJECT_ID</key>
-	<string>al-habib-mohemm</string>
-	<key>STORAGE_BUCKET</key>
-	<string>al-habib-mohemm.appspot.com</string>
-	<key>IS_ADS_ENABLED</key>
-	<false></false>
-	<key>IS_ANALYTICS_ENABLED</key>
-	<false></false>
-	<key>IS_APPINVITE_ENABLED</key>
-	<true></true>
-	<key>IS_GCM_ENABLED</key>
-	<true></true>
-	<key>IS_SIGNIN_ENABLED</key>
-	<true></true>
-	<key>GOOGLE_APP_ID</key>
-	<string>1:448880075189:ios:c6fd2b86fe7b388088b9fc</string>
-	<key>DATABASE_URL</key>
-	<string>https://al-habib-mohemm.firebaseio.com</string>
-</dict>
-</plist>
\ No newline at end of file
diff --git a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/GOOGLE SERVICES/google-services.json b/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/GOOGLE SERVICES/google-services.json
deleted file mode 100644
index 81453f28..00000000
--- a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/AL HABIB MOHEMM/GOOGLE SERVICES/google-services.json	
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "project_info": {
-    "project_number": "448880075189",
-    "firebase_url": "https://al-habib-mohemm.firebaseio.com",
-    "project_id": "al-habib-mohemm",
-    "storage_bucket": "al-habib-mohemm.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:448880075189:android:5bb4821d515a826d88b9fc",
-        "android_client_info": {
-          "package_name": "com.cloudsolutions.alhabibmohemm"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "448880075189-49hc2l78pr9hsmr9p3k7j411r40diej8.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyC8nrli7eyuRNow8nF-QHvDMOxqUkj6fEw"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "448880075189-49hc2l78pr9hsmr9p3k7j411r40diej8.apps.googleusercontent.com",
-              "client_type": 3
-            },
-            {
-              "client_id": "448880075189-tcgggmh2ua9tsmdr97c1ttcgrmf5kg5m.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "com.cloudsolutions.alhabibmohemm"
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/.DS_Store b/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/.DS_Store
deleted file mode 100644
index 4a90ff6c..00000000
Binary files a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/.DS_Store and /dev/null differ
diff --git a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM DEVELOPMENT SSL CERTIFICATE/.DS_Store b/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM DEVELOPMENT SSL CERTIFICATE/.DS_Store
deleted file mode 100644
index dd2ccbb6..00000000
Binary files a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM DEVELOPMENT SSL CERTIFICATE/.DS_Store and /dev/null differ
diff --git a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM DEVELOPMENT SSL CERTIFICATE/PUSH NOTIFICATIONS/.DS_Store b/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM DEVELOPMENT SSL CERTIFICATE/PUSH NOTIFICATIONS/.DS_Store
deleted file mode 100644
index ffe132c2..00000000
Binary files a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM DEVELOPMENT SSL CERTIFICATE/PUSH NOTIFICATIONS/.DS_Store and /dev/null differ
diff --git a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM DEVELOPMENT SSL CERTIFICATE/PUSH NOTIFICATIONS/AuthKey_67L2G322GR.p8 b/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM DEVELOPMENT SSL CERTIFICATE/PUSH NOTIFICATIONS/AuthKey_67L2G322GR.p8
deleted file mode 100644
index eddd4c6a..00000000
--- a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM DEVELOPMENT SSL CERTIFICATE/PUSH NOTIFICATIONS/AuthKey_67L2G322GR.p8	
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQg+oBl9YdOiMRXfQZe
-nIe6tR1tojoOvvcohNJmJtH+SsagCgYIKoZIzj0DAQehRANCAATDY9E82MAgMI/g
-bKF1t4zLHJ1Yt9uoOnedNYsfyZLhh3l3ZyXRj02uDXz04AsNbNFjkLJXPc4xY9ad
-+A4rY70x
------END PRIVATE KEY-----
\ No newline at end of file
diff --git a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/GOOGLE SERVICES/GoogleService-Info.plist b/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/GOOGLE SERVICES/GoogleService-Info.plist
deleted file mode 100644
index 89817c12..00000000
--- a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/GOOGLE SERVICES/GoogleService-Info.plist	
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CLIENT_ID</key>
-	<string>679409052782-3teqf8vdh9e1suvnhddj3pgmna7vg5rt.apps.googleusercontent.com</string>
-	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.679409052782-3teqf8vdh9e1suvnhddj3pgmna7vg5rt</string>
-	<key>API_KEY</key>
-	<string>AIzaSyCjMjhbeS7qilBoP4SH0t3SgkkHryf34JA</string>
-	<key>GCM_SENDER_ID</key>
-	<string>679409052782</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.cloudsolutions.mohemm</string>
-	<key>PROJECT_ID</key>
-	<string>mohemm-dce93</string>
-	<key>STORAGE_BUCKET</key>
-	<string>mohemm-dce93.appspot.com</string>
-	<key>IS_ADS_ENABLED</key>
-	<false></false>
-	<key>IS_ANALYTICS_ENABLED</key>
-	<false></false>
-	<key>IS_APPINVITE_ENABLED</key>
-	<true></true>
-	<key>IS_GCM_ENABLED</key>
-	<true></true>
-	<key>IS_SIGNIN_ENABLED</key>
-	<true></true>
-	<key>GOOGLE_APP_ID</key>
-	<string>1:679409052782:ios:ace07cf8ba043b48a78a7f</string>
-	<key>DATABASE_URL</key>
-	<string>https://mohemm-dce93.firebaseio.com</string>
-</dict>
-</plist>
\ No newline at end of file
diff --git a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/GOOGLE SERVICES/google-services.json b/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/GOOGLE SERVICES/google-services.json
deleted file mode 100644
index 46d93642..00000000
--- a/app document/Mohemm Updated Documents Android IOS/CLOUD SOLUTIONS MOHEMM/CLOUD SOLUTIONS MOHEMM/GOOGLE SERVICES/google-services.json	
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "project_info": {
-    "project_number": "679409052782",
-    "firebase_url": "https://mohemm-dce93.firebaseio.com",
-    "project_id": "mohemm-dce93",
-    "storage_bucket": "mohemm-dce93.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:679409052782:android:dba155ac0859d7fea78a7f",
-        "android_client_info": {
-          "package_name": "hmg.cloudSolutions.mohem"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "679409052782-mtd6d8rjltucnm9uatn6g7et08sm6lbv.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyDgWjuSBIKGghWxYg_KGBRIZTi-O_UA8mU"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "679409052782-mtd6d8rjltucnm9uatn6g7et08sm6lbv.apps.googleusercontent.com",
-              "client_type": 3
-            },
-            {
-              "client_id": "679409052782-3teqf8vdh9e1suvnhddj3pgmna7vg5rt.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "com.cloudsolutions.mohemm"
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/app document/Mohemm Updated Documents Android IOS/CertificateSigningRequest.certSigningRequest b/app document/Mohemm Updated Documents Android IOS/CertificateSigningRequest.certSigningRequest
deleted file mode 100644
index f39f2a2b..00000000
--- a/app document/Mohemm Updated Documents Android IOS/CertificateSigningRequest.certSigningRequest	
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIICoTCCAYkCAQAwXDEzMDEGCSqGSIb3DQEJARYkQ2hvdWRocnkuTWFzb29kQGNs
-b3Vkc29sdXRpb24tc2EuY29tMRgwFgYDVQQDDA9DaG91ZGhyeSBNYXNvb2QxCzAJ
-BgNVBAYTAlNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApkQA87EF
-GiHTVqx7SWD+3qaVSHTFrTCro9DJZ5na/WGsF06xfoZJT/S5jFW5DlWHWsJak/vx
-BqsuH3VGTEneoEiWc+Zyh6Lb6SvgDmfee2MB+k8E6dHE4Z5Z7aiBXSTjIjKcWEjj
-41++FVihddY+p9723WFhcEWcA2Nq2p9KSZlKZNqui5xU/16z6RW7YSu0ylBUE8+g
-E5GLzRgALzoSNT5OedXqdIoR9k1Jds2ep+DKqjl35hKOX215b3tzfyamPK2i1UHB
-eaYBXnObkyJe4EIcqlTM8Eeo23yxsHYyRrJmJDDm4GaXRXrQ2193XpLHNlq88no5
-wgI+yYsb7zvwowIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAIQsZ1fP8XImSQ+L
-TvR4mT98DI5Ld/xLnw/LXRNJrZVtxMjdUwwcMhvxbfGX4Ji4wpttkzbkr86Jyh+U
-dbfVqHKLIGo8xjYl4uCcjYIqnY2hBduv+/aWWoFAJ9w5tv8Oo/3hasF97zQi+vZh
-Uzqdp/8IWb8/QGE2HRqKbSUMKBeUzDmyQTnM7QeS5kuT5MQZjDnFLV2v3Sxa383L
-9jFqNQjS7b1mcVJ4/HsW7yUYoDZ8C90fUp2zs5k4SFad8MG4J1IsoshXuBgBvcFg
-haDt0P+hh6QVk9yf4zGgcbU7501ya5T5MgZ8moxnlklf3mqGUCK2IU8PBc2IquyG
-2PrSkpI=
------END CERTIFICATE REQUEST-----
diff --git a/app document/Packadge Name.txt b/app document/Packadge Name.txt
deleted file mode 100644
index da313ecb..00000000
--- a/app document/Packadge Name.txt	
+++ /dev/null
@@ -1,6 +0,0 @@
-CS :
-android:hmg.cloudSolutions.mohem
-IOS :com.cloudsolutions.mohemm
-
-HMG :
-com.cloudsolutions.alhabibmohemm
\ No newline at end of file
diff --git a/app document/icons.zip b/app document/icons.zip
deleted file mode 100644
index 5e769895..00000000
Binary files a/app document/icons.zip and /dev/null differ
diff --git a/app document/phase 2 documents/ESS API Integration V 0 34.doc b/app document/phase 2 documents/ESS API Integration V 0 34.doc
deleted file mode 100644
index 408fb5c5..00000000
Binary files a/app document/phase 2 documents/ESS API Integration V 0 34.doc and /dev/null differ
diff --git a/app document/phase 2 documents/ESS Phase 2 methods.txt b/app document/phase 2 documents/ESS Phase 2 methods.txt
deleted file mode 100644
index a136e98f..00000000
--- a/app document/phase 2 documents/ESS Phase 2 methods.txt	
+++ /dev/null
@@ -1,48 +0,0 @@
-GET_SHIFT_TYPES
-GET_TIME_CARD_SUMMARY
-GET_DAY_HOURS_TYPE_DETAILS
-GET_SCHEDULE_SHIFTS_DETAILS
-GET_SWIPES
-GET_PAYSLIP
-GET_SUMMARY_OF_PAYMENT
-GET_EARNINGS
-GET_DEDUCTIONS
-GET_PAYMENT_INFORMATION
-GET_MO_NOTIFICATION_BODY
-GET_PR_NOTIFICATION_BODY
-GET_PO_NOTIFICATION_BODY
-GET_PO_ITEM_HISTORY
-GET_QUOTATION_ANALYSIS
-GET_PENDING_REQ_FUNCTIONS
-GET_PENDING_REQ_DETAILS
-UPDATE_EMPLOYEE_IMAGE
-GET_OBJECT_VALUES
-GET_EMPLOYEE_PHONES
-SUBMIT_PHONES_TRANSACTION
-START_PHONES_APPROVAL_PROCESS
-GET_PHONES_NOTIFICATION_BODY
-GET_EMPLOYEE_BASIC_DETAILS
-GET_BASIC_DET_COLS_STRUCTURE
-GET_BASIC_DET_DFF_STRUCTURE
-SUBMIT_BASIC_DET_TRANSACTION
-START_BASIC_DET_APPR_PROCESS
-GET_BASIC_DET_NTF_BODY
-GET_MO_ITEM_HISTORY
-GET_COUNTRIES
-GET_EMPLOYEE_ADDRESS
-GET_ADDRESS_DFF_STRUCTURE
-SUBMIT_ADDRESS_TRANSACTION
-START_ADDRESS_APPROVAL_PROCESS
-GET_ADDRESS_NOTIFICATION_BODY
-GET_EMPLOYEE_CONTACTS
-GET_CONTACT_DETAILS
-GET_CONTACT_COLS_STRUCTURE
-GET_CONTACT_DFF_STRUCTURE
-SUBMIT_CONTACT_TRANSACTION
-START_CONTACT_APPROVAL_PROCESS
-GET_TERM_COLS_STRUCTURE
-GET_TERM_DFF_STRUCTURE
-SUBMIT_TERM_TRANSACTION
-START_TERM_APPROVAL_PROCESS
-GET_TERM_NOTIFICATION_BODY
-GET_CONTACT_NOTIFICATION_BODY
\ No newline at end of file
diff --git a/app document/phase 2 documents/ITG Form Integration V1 2.docx b/app document/phase 2 documents/ITG Form Integration V1 2.docx
deleted file mode 100644
index d64f55cb..00000000
Binary files a/app document/phase 2 documents/ITG Form Integration V1 2.docx and /dev/null differ
diff --git a/app document/phase 2 documents/cr-3629-employee app 2.pdf b/app document/phase 2 documents/cr-3629-employee app 2.pdf
deleted file mode 100644
index f4c92c05..00000000
Binary files a/app document/phase 2 documents/cr-3629-employee app 2.pdf and /dev/null differ
diff --git a/app document/phase 2 documents/~$G Form Integration V1 2.docx b/app document/phase 2 documents/~$G Form Integration V1 2.docx
deleted file mode 100644
index f08a34a5..00000000
Binary files a/app document/phase 2 documents/~$G Form Integration V1 2.docx and /dev/null differ
