diff --git a/config.xml b/config.xml
index fc7b26fa3..978013e02 100644
--- a/config.xml
+++ b/config.xml
@@ -20,7 +20,6 @@
     <preference name="SplashShowOnlyFirstTime" value="false" />
     <preference name="SplashScreen" value="screen" />
     <preference name="SplashScreenDelay" value="3000" />
-    <preference name="android-minSdkVersion" value="20" />
     <platform name="android">
         <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application" xmlns:android="http://schemas.android.com/apk/res/android">
             <application android:networkSecurityConfig="@xml/network_security_config" />
@@ -50,4 +49,6 @@
     <allow-navigation href="http://localhost:8100" sessionid="9714472a" />
     <allow-navigation href="http://localhost:8101" sessionid="4721f88c" />
     <plugin name="cordova-plugin-dbcopy" spec="https://github.com/an-rahulpandey/cordova-plugin-dbcopy.git" />
+    <engine name="browser" />
+    <engine name="android" />
 </widget>
diff --git a/firebase-messaging-sw.js b/firebase-messaging-sw.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/package-lock.json b/package-lock.json
index 5573b2cc6..ec86b1c11 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2035,6 +2035,11 @@
       "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-3.3.0.tgz",
       "integrity": "sha512-dzbzdN7KjjwpUbg7mZKVkgAVytEwGyXUL4Z1t9c12UhViJaNjU7/nSlTXjb+IiauwVg9oI2LHtSVrp1NIjUycw=="
     },
+    "@capacitor/app": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@capacitor/app/-/app-1.0.5.tgz",
+      "integrity": "sha512-U0dAw1CAjKyguSRxKDabszsQ4dj679RnxaUZrSHDR5Jnt5x308oQuKXFP++wnMBbw72D02iqjG0a+/Ujye7C9g=="
+    },
     "@capacitor/cli": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-3.3.0.tgz",
@@ -2147,6 +2152,26 @@
         "tslib": "^2.1.0"
       }
     },
+    "@capacitor/haptics": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@capacitor/haptics/-/haptics-1.1.2.tgz",
+      "integrity": "sha512-h7uAK/iTSDYfvMY2aaZJ5tlGyIOOdH17mzHHED4jgP3TSXbsmeYU839u56hNGi9vb4Q00Jsb0YzsDMzSjv4Nag=="
+    },
+    "@capacitor/keyboard": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@capacitor/keyboard/-/keyboard-1.1.2.tgz",
+      "integrity": "sha512-EUduhQzrHma4PlGfdSxVeGIwxR2+/xLRDbjQH5Q4cXqrlYssIX2UyQrL4wNpDaAOg1Z4VD8EzzVolC81LG6Q+A=="
+    },
+    "@capacitor/push-notifications": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@capacitor/push-notifications/-/push-notifications-1.0.7.tgz",
+      "integrity": "sha512-vbvAptFq5cI6xKYYWMb7tsWvA88/PTG4v6ptxN0Ygtc1fQ4l/AzONQiYqdtFpbBhF2fML2kXQ/5eSAfn8HY9aw=="
+    },
+    "@capacitor/status-bar": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@capacitor/status-bar/-/status-bar-1.0.5.tgz",
+      "integrity": "sha512-SZuxjaN5Nr8FKUVlkVH3l0X2JWey0yVMfMhyE3RG7ryUSAesgs3bvkAEXSfjphsHOpt4A/rEeCJb2ZbeCBwroA=="
+    },
     "@cnakazawa/watch": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
@@ -2179,6 +2204,568 @@
       "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
       "dev": true
     },
+    "@firebase/analytics": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.7.3.tgz",
+      "integrity": "sha512-FrWo266CzFiNPBvt4hY3wgRrkcMjb7QY+sCEnyJXaXc10QfgWtpFDPkV+mJwS5djRAlU6/FrAMe7y1w7xcSZsg==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/installations": "0.5.3",
+        "@firebase/logger": "0.3.1",
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/analytics-compat": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.1.4.tgz",
+      "integrity": "sha512-1/3wpiWGOu1+mX0ZDMl2FkYZGZt3iYdFh80FBOa4GN6ohgTWK21N35EB8E4jS7Gz4a70dBtWHxWrzhLLzL5JyA==",
+      "requires": {
+        "@firebase/analytics": "0.7.3",
+        "@firebase/analytics-types": "0.7.0",
+        "@firebase/component": "0.5.8",
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/analytics-types": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics-types/-/analytics-types-0.7.0.tgz",
+      "integrity": "sha512-DNE2Waiwy5+zZnCfintkDtBfaW6MjIG883474v6Z0K1XZIvl76cLND4iv0YUb48leyF+PJK1KO2XrgHb/KpmhQ=="
+    },
+    "@firebase/app": {
+      "version": "0.7.6",
+      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.7.6.tgz",
+      "integrity": "sha512-/KqKT7BSq9qseBAjS6JxJy6QosoWRVvDT/3tV9p26gVM5mqrmimTJvSh5+NMlTn1cf00DjCzQcOyaZrcJB54dg==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/logger": "0.3.1",
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/app-check": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.5.0.tgz",
+      "integrity": "sha512-J9mod9V+o/0cq/57FxjAx5Whx7zVHJL0OWGi64ERFpG2gC9MAcGsqKy76zpGGTvEuGKEFgTILcXHchIlmjOrmw==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/logger": "0.3.1",
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/app-check-compat": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.2.0.tgz",
+      "integrity": "sha512-SwXVFjcwC1ksYOT3GFyAa4nQeUfXSYN+j7B1Vb4qlk7CBqmIYWhX/KlP1EAaOhmPuwsvA10E1t3HKeY+rmFzkw==",
+      "requires": {
+        "@firebase/app-check": "0.5.0",
+        "@firebase/component": "0.5.8",
+        "@firebase/logger": "0.3.1",
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/app-check-interop-types": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.1.0.tgz",
+      "integrity": "sha512-uZfn9s4uuRsaX5Lwx+gFP3B6YsyOKUE+Rqa6z9ojT4VSRAsZFko9FRn6OxQUA1z5t5d08fY4pf+/+Dkd5wbdbA=="
+    },
+    "@firebase/app-compat": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.1.7.tgz",
+      "integrity": "sha512-Wb8w5XRPMC9HYPByMfqJt6SVabWEtOL4ccZHjtOzaJa0pJkLOYmgUOikqTchHaRla/cHPfR6pBQO3C5ljikkyw==",
+      "requires": {
+        "@firebase/app": "0.7.6",
+        "@firebase/component": "0.5.8",
+        "@firebase/logger": "0.3.1",
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/app-types": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz",
+      "integrity": "sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg=="
+    },
+    "@firebase/auth": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.19.1.tgz",
+      "integrity": "sha512-U5QV0AJ7RdHOHHLUYSZouRdu0hXJ0RFyRl9GgrwnkLKTX1qaWUrHOQZEwrD3TGE6bfFsWtjg+KYHeOImMqkB9g==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/logger": "0.3.1",
+        "@firebase/util": "1.4.1",
+        "node-fetch": "2.6.5",
+        "selenium-webdriver": "4.0.0-rc-1",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "node-fetch": {
+          "version": "2.6.5",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
+          "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
+          "requires": {
+            "whatwg-url": "^5.0.0"
+          }
+        },
+        "selenium-webdriver": {
+          "version": "4.0.0-rc-1",
+          "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-rc-1.tgz",
+          "integrity": "sha512-bcrwFPRax8fifRP60p7xkWDGSJJoMkPAzufMlk5K2NyLPht/YZzR2WcIk1+3gR8VOCLlst1P2PI+MXACaFzpIw==",
+          "requires": {
+            "jszip": "^3.6.0",
+            "rimraf": "^3.0.2",
+            "tmp": "^0.2.1",
+            "ws": ">=7.4.6"
+          }
+        },
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@firebase/auth-compat": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.2.1.tgz",
+      "integrity": "sha512-D3Cs5maug2pvk0epjCnmgATVlT3Lt2/yPB7UTLKjM+ZW1RewRMd18ruMJkeSArwApHxi1CCPxSTKNqvG4eKSMw==",
+      "requires": {
+        "@firebase/auth": "0.19.1",
+        "@firebase/auth-types": "0.11.0",
+        "@firebase/component": "0.5.8",
+        "@firebase/util": "1.4.1",
+        "node-fetch": "2.6.5",
+        "selenium-webdriver": "^4.0.0-beta.2",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "node-fetch": {
+          "version": "2.6.5",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
+          "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
+          "requires": {
+            "whatwg-url": "^5.0.0"
+          }
+        },
+        "selenium-webdriver": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0.tgz",
+          "integrity": "sha512-tOlu6FnTjPq2FKpd153pl8o2cB7H40Rvl/ogiD2sapMv4IDjQqpIxbd+swDJe9UDLdszeh5CDis6lgy4e9UG1w==",
+          "requires": {
+            "jszip": "^3.6.0",
+            "rimraf": "^3.0.2",
+            "tmp": "^0.2.1",
+            "ws": ">=7.4.6"
+          }
+        },
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@firebase/auth-interop-types": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz",
+      "integrity": "sha512-etIi92fW3CctsmR9e3sYM3Uqnoq861M0Id9mdOPF6PWIg38BXL5k4upCNBggGUpLIS0H1grMOvy/wn1xymwe2g=="
+    },
+    "@firebase/auth-types": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.11.0.tgz",
+      "integrity": "sha512-q7Bt6cx+ySj9elQHTsKulwk3+qDezhzRBFC9zlQ1BjgMueUOnGMcvqmU0zuKlQ4RhLSH7MNAdBV2znVaoN3Vxw=="
+    },
+    "@firebase/component": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.8.tgz",
+      "integrity": "sha512-td705iXrumVoZbpxFg1kuD+/NtYMQwAK37DITJNmVEe5E0gUHAGeBptXNL4KPCHOd8+/7EB4JfaUOZDxylp2+g==",
+      "requires": {
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/database": {
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.12.3.tgz",
+      "integrity": "sha512-L2f1jgmQgrTL5l4rh4/JBw3+stVHaOSvd6sJ0aMJ3WifLLSYeW7TcqxrSqOqCqE8f2NlM2ugl9uF2/kJKk8V5A==",
+      "requires": {
+        "@firebase/auth-interop-types": "0.1.6",
+        "@firebase/component": "0.5.8",
+        "@firebase/logger": "0.3.1",
+        "@firebase/util": "1.4.1",
+        "faye-websocket": "0.11.4",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/database-compat": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.1.3.tgz",
+      "integrity": "sha512-Y6di+XLM3UyntenjxWcmcesOfFjHOoaDqOStyryILSHNtyWeOCLDnuatJ/RNSNC2LDFFlKDqOj8C+LHGaubhNg==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/database": "0.12.3",
+        "@firebase/database-types": "0.9.2",
+        "@firebase/logger": "0.3.1",
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/database-types": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.9.2.tgz",
+      "integrity": "sha512-arIcrtyuca171NhaQNzyXd/+s8xemxnMpQb3hboW9UFbctOpa0fqmqMBg26rmIVOBzJ1APTw7GmXu7ch6JLoxA==",
+      "requires": {
+        "@firebase/app-types": "0.7.0",
+        "@firebase/util": "1.4.1"
+      }
+    },
+    "@firebase/firestore": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-3.2.1.tgz",
+      "integrity": "sha512-n0uNTRlhVee0O+VvDkB/e1gtH96+242LmRe8YUHGqGKPHgtFrZAhePlY31ujwaVzlP5Fw0hBffwYIe9GwWlmSA==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/logger": "0.3.1",
+        "@firebase/util": "1.4.1",
+        "@firebase/webchannel-wrapper": "0.6.1",
+        "@grpc/grpc-js": "^1.3.2",
+        "@grpc/proto-loader": "^0.6.0",
+        "node-fetch": "2.6.5",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "node-fetch": {
+          "version": "2.6.5",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
+          "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
+          "requires": {
+            "whatwg-url": "^5.0.0"
+          }
+        },
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@firebase/firestore-compat": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.1.6.tgz",
+      "integrity": "sha512-CzpC8dcnBdoKlONnmObCQYOq+zEPdt1wgBH7Jo/0IWFmLEOIJ0aFZoxv6JVqi/qrZIroJ3Yd1KK36auOiQJ7Fw==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/firestore": "3.2.1",
+        "@firebase/firestore-types": "2.5.0",
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/firestore-types": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-2.5.0.tgz",
+      "integrity": "sha512-I6c2m1zUhZ5SH0cWPmINabDyH5w0PPFHk2UHsjBpKdZllzJZ2TwTkXbDtpHUZNmnc/zAa0WNMNMvcvbb/xJLKA=="
+    },
+    "@firebase/functions": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.7.4.tgz",
+      "integrity": "sha512-HU6PNp4u1SNbXZD3Jy/Sv5bTmc/WZCd+tf4wWn7oHD83Ms285TGDjG6PrKxgZIuBL3aPF/2JBXrEgZL7BATI9w==",
+      "requires": {
+        "@firebase/app-check-interop-types": "0.1.0",
+        "@firebase/auth-interop-types": "0.1.6",
+        "@firebase/component": "0.5.8",
+        "@firebase/messaging-interop-types": "0.1.0",
+        "@firebase/util": "1.4.1",
+        "node-fetch": "2.6.5",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "node-fetch": {
+          "version": "2.6.5",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
+          "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
+          "requires": {
+            "whatwg-url": "^5.0.0"
+          }
+        },
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@firebase/functions-compat": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.1.5.tgz",
+      "integrity": "sha512-uqudQemXstb1lmiErVC8jCgLDyp/quc+McVekNLBCTfE9IoonXpepik0APH0Oj0smBs2oPIBpIL10VXdRjvP9Q==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/functions": "0.7.4",
+        "@firebase/functions-types": "0.5.0",
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/functions-types": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.5.0.tgz",
+      "integrity": "sha512-qza0M5EwX+Ocrl1cYI14zoipUX4gI/Shwqv0C1nB864INAD42Dgv4v94BCyxGHBg2kzlWy8PNafdP7zPO8aJQA=="
+    },
+    "@firebase/installations": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.5.3.tgz",
+      "integrity": "sha512-l4HGnzFbr9E9OuXHJwjAzcWb4YW6Z3dqAqFqE4uSeFZnTANi/tV5pUVJu4FZHidkFAH/MREwbfI5JACfQ7k1tQ==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/util": "1.4.1",
+        "idb": "3.0.2",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/logger": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.3.1.tgz",
+      "integrity": "sha512-RlqTPGWQSFESVbcA9IsNi8hRcp+8SV7HHHAU7YrcmdXTD1RNlz50sCIq4EcXaXgBphdc7yb3Xtvle0QuFETUlg==",
+      "requires": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/messaging": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.9.3.tgz",
+      "integrity": "sha512-MOWm9gNTHimhxTnA5yqRZxC+E/iqnPMlX9mp55dLY/WKkpbjSNrORQmR7olLDGyCEsL+kIpLY7Hi4uPZu5t98Q==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/installations": "0.5.3",
+        "@firebase/messaging-interop-types": "0.1.0",
+        "@firebase/util": "1.4.1",
+        "idb": "3.0.2",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/messaging-compat": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.1.3.tgz",
+      "integrity": "sha512-XoLJHpy6cSIWZvcNzz6j17UkIzYWZvz8u44P/mjkXq7K5Q0QsRMTSXxRRRrSlwFALEKq0kVY8YccshkVTvtIdw==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/messaging": "0.9.3",
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/messaging-interop-types": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging-interop-types/-/messaging-interop-types-0.1.0.tgz",
+      "integrity": "sha512-DbvUl/rXAZpQeKBnwz0NYY5OCqr2nFA0Bj28Fmr3NXGqR4PAkfTOHuQlVtLO1Nudo3q0HxAYLa68ZDAcuv2uKQ=="
+    },
+    "@firebase/performance": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.5.3.tgz",
+      "integrity": "sha512-L0MjQwfmc30Ep6IZxle9rjD9lYil82d8E6QChjD+NGaxQOkujJgHUSKmq7dE3pQpEPYQ0FOOzy7FKN2AJEiHKQ==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/installations": "0.5.3",
+        "@firebase/logger": "0.3.1",
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/performance-compat": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.1.3.tgz",
+      "integrity": "sha512-as/4kskp4yPgGrRQMRwuvOGnzoj/87e0CoEw31fCAVVakiHXznOu300kyEJad9IuVuIl7lxB03JoQTldwtUAnA==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/logger": "0.3.1",
+        "@firebase/performance": "0.5.3",
+        "@firebase/performance-types": "0.1.0",
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/performance-types": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@firebase/performance-types/-/performance-types-0.1.0.tgz",
+      "integrity": "sha512-6p1HxrH0mpx+622Ql6fcxFxfkYSBpE3LSuwM7iTtYU2nw91Hj6THC8Bc8z4nboIq7WvgsT/kOTYVVZzCSlXl8w=="
+    },
+    "@firebase/polyfill": {
+      "version": "0.3.36",
+      "resolved": "https://registry.npmjs.org/@firebase/polyfill/-/polyfill-0.3.36.tgz",
+      "integrity": "sha512-zMM9oSJgY6cT2jx3Ce9LYqb0eIpDE52meIzd/oe/y70F+v9u1LDqk5kUF5mf16zovGBWMNFmgzlsh6Wj0OsFtg==",
+      "requires": {
+        "core-js": "3.6.5",
+        "promise-polyfill": "8.1.3",
+        "whatwg-fetch": "2.0.4"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.6.5",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+          "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
+        }
+      }
+    },
+    "@firebase/remote-config": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.3.2.tgz",
+      "integrity": "sha512-kS31tzXZ4Jb1qFTM5zhx0Er0C3BPPMLxmZDe1xaPF/nNqP1CPFwnmUiGT2rnuQ90Uc4f0j24dahISQe9qlLniA==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/installations": "0.5.3",
+        "@firebase/logger": "0.3.1",
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/remote-config-compat": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.1.3.tgz",
+      "integrity": "sha512-BXrvJ9kLoiNgDXHgwLO83P287yj2cCdxtPpBBslZCgKiksSAAWSBsTYlIzMTFScJ9JcJDXvM1PXpejWPxCs8AA==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/logger": "0.3.1",
+        "@firebase/remote-config": "0.3.2",
+        "@firebase/remote-config-types": "0.2.0",
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/remote-config-types": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@firebase/remote-config-types/-/remote-config-types-0.2.0.tgz",
+      "integrity": "sha512-hqK5sCPeZvcHQ1D6VjJZdW6EexLTXNMJfPdTwbD8NrXUw6UjWC4KWhLK/TSlL0QPsQtcKRkaaoP+9QCgKfMFPw=="
+    },
+    "@firebase/storage": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.8.5.tgz",
+      "integrity": "sha512-cYPNs8lAxlll4/SIorA/Wot4BngC/uLcq5AGN7axoVWeShmQyeLDL5h2XuqRks8JlJ6eHmpxZcDZNCxzAAj+lg==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/util": "1.4.1",
+        "node-fetch": "2.6.5",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "node-fetch": {
+          "version": "2.6.5",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
+          "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
+          "requires": {
+            "whatwg-url": "^5.0.0"
+          }
+        },
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@firebase/storage-compat": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.1.5.tgz",
+      "integrity": "sha512-Qnpp9SmoU4MtwXTpHbjNX5CzKMFz6xFJUJqGbsFDLoifsuQwUr/t8SPpLv2/evnPkIEw5c2rFu6nYLdDK8mslA==",
+      "requires": {
+        "@firebase/component": "0.5.8",
+        "@firebase/storage": "0.8.5",
+        "@firebase/storage-types": "0.6.0",
+        "@firebase/util": "1.4.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/storage-types": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.6.0.tgz",
+      "integrity": "sha512-1LpWhcCb1ftpkP/akhzjzeFxgVefs6eMD2QeKiJJUGH1qOiows2w5o0sKCUSQrvrRQS1lz3SFGvNR1Ck/gqxeA=="
+    },
+    "@firebase/util": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.4.1.tgz",
+      "integrity": "sha512-6GM+R1MQaLmzVOX/keb1oTWUYG0jqvA5dTsh/rsCNR1ndPCtDKiMTcH5XKHEzyog1+NLSVTSMsN/AqTmm2rGCw==",
+      "requires": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/webchannel-wrapper": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.6.1.tgz",
+      "integrity": "sha512-9FqhNjKQWpQ3fGnSOCovHOm+yhhiorKEqYLAfd525jWavunDJcx8rOW6i6ozAh+FbwcYMkL7b+3j4UR/30MpoQ=="
+    },
     "@fortawesome/angular-fontawesome": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.9.0.tgz",
@@ -2280,6 +2867,43 @@
       "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz",
       "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="
     },
+    "@grpc/grpc-js": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.4.2.tgz",
+      "integrity": "sha512-aUN6oGk9un8rfYWz73nQgFxPCYJQYd8LpIGguZHBsNduBMyqG6EWANrsVBuTG+nl/l4dKb3x+qi1l9+oxDxqGg==",
+      "requires": {
+        "@grpc/proto-loader": "^0.6.4",
+        "@types/node": ">=12.12.47"
+      }
+    },
+    "@grpc/proto-loader": {
+      "version": "0.6.6",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.6.tgz",
+      "integrity": "sha512-cdMaPZ8AiFz6ua6PUbP+LKbhwJbFXnrQ/mlnKGUyzDUZ3wp7vPLksnmLCBX6SHgSmjX7CbNVNLFYD5GmmjO4GQ==",
+      "requires": {
+        "@types/long": "^4.0.1",
+        "lodash.camelcase": "^4.3.0",
+        "long": "^4.0.0",
+        "protobufjs": "^6.10.0",
+        "yargs": "^16.1.1"
+      },
+      "dependencies": {
+        "yargs": {
+          "version": "16.2.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+          "requires": {
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.0",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^20.2.2"
+          }
+        }
+      }
+    },
     "@hapi/hoek": {
       "version": "9.2.1",
       "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.1.tgz",
@@ -2352,21 +2976,6 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/fingerprint-aio/-/fingerprint-aio-4.20.0.tgz",
       "integrity": "sha512-DhdXVG7gdBtCwYHDAsNazIcMlyt6X968ilA/5Rt8uFd+xN4Un5gZteOJCVn9xWDC/ZqhO/QAq2M0BIGyEhzW0g=="
     },
-    "@ionic-native/firebase-x": {
-      "version": "5.36.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/firebase-x/-/firebase-x-5.36.0.tgz",
-      "integrity": "sha512-h6jfTFqvABwugir5tsAzyvUWdu0EZg1PnWW0EkQy3CRg/qQlcjiDJW8pqyq1l84UDJQ7fxiTvbmX0Jod2BFE3w==",
-      "requires": {
-        "@types/cordova": "^0.0.34"
-      },
-      "dependencies": {
-        "@types/cordova": {
-          "version": "0.0.34",
-          "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
-          "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
-        }
-      }
-    },
     "@ionic-native/http": {
       "version": "5.36.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/http/-/http-5.36.0.tgz",
@@ -3866,6 +4475,60 @@
       "resolved": "https://registry.npmjs.org/@pdftron/pdfjs-express/-/pdfjs-express-8.1.0.tgz",
       "integrity": "sha512-YKH2M8ZVXQgFpxVKD48mtDcVwjdLkibp4j9gCMkywSwDc1lQv2jzGmRSBQzsq5QKVx54MHHVWIr5hG21KduACw=="
     },
+    "@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78="
+    },
+    "@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
+    },
+    "@protobufjs/codegen": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
+    },
+    "@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+      "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A="
+    },
+    "@protobufjs/fetch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+      "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=",
+      "requires": {
+        "@protobufjs/aspromise": "^1.1.1",
+        "@protobufjs/inquire": "^1.1.0"
+      }
+    },
+    "@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E="
+    },
+    "@protobufjs/inquire": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+      "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik="
+    },
+    "@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0="
+    },
+    "@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q="
+    },
+    "@protobufjs/utf8": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+      "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
+    },
     "@rkusa/linebreak": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@rkusa/linebreak/-/linebreak-1.0.0.tgz",
@@ -4171,6 +4834,11 @@
       "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.175.tgz",
       "integrity": "sha512-XmdEOrKQ8a1Y/yxQFOMbC47G/V2VDO1GvMRnl4O75M4GW/abC5tnfzadQYkqEveqRM1dEJGFFegfPNA2vvx2iw=="
     },
+    "@types/long": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz",
+      "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
+    },
     "@types/minimatch": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
@@ -4180,8 +4848,7 @@
     "@types/node": {
       "version": "12.20.27",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.27.tgz",
-      "integrity": "sha512-qZdePUDSLAZRXXV234bLBEUM0nAQjoxbcSwp1rqSMUe1rZ47mwU6OjciR/JvF1Oo8mc0ys6GE0ks0HGgqAZoGg==",
-      "dev": true
+      "integrity": "sha512-qZdePUDSLAZRXXV234bLBEUM0nAQjoxbcSwp1rqSMUe1rZ47mwU6OjciR/JvF1Oo8mc0ys6GE0ks0HGgqAZoGg=="
     },
     "@types/parse-json": {
       "version": "4.0.0",
@@ -5449,15 +6116,6 @@
         }
       }
     },
-    "bplist-creator": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.1.0.tgz",
-      "integrity": "sha512-sXaHZicyEEmY86WyueLTQesbeoH/mquvarJaQNbjuOQO+7gbFcDEWqKmcWA4cOTLzFlfgvkiVxolk1k5bBIpmg==",
-      "dev": true,
-      "requires": {
-        "stream-buffers": "2.2.x"
-      }
-    },
     "bplist-parser": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
@@ -7133,10 +7791,9 @@
       "integrity": "sha1-C8ZXVyduvZIMASzpIOJ0F3V2Nz4=",
       "dev": true
     },
-    "cordova-plugin-crosswalk-webview": {
-      "version": "git+https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview.git#58dda06c97609c6a0699b8d0691ad603901625ce",
-      "from": "git+https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview.git",
-      "dev": true
+    "cordova-plugin-dbcopy": {
+      "version": "git+https://github.com/an-rahulpandey/cordova-plugin-dbcopy.git#861f585e4313db828d6b8c7d354c32c83373d0d2",
+      "from": "git+https://github.com/an-rahulpandey/cordova-plugin-dbcopy.git"
     },
     "cordova-plugin-device": {
       "version": "2.0.3",
@@ -9395,7 +10052,6 @@
       "version": "0.11.4",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
       "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "dev": true,
       "requires": {
         "websocket-driver": ">=0.5.1"
       }
@@ -9513,6 +10169,39 @@
         "locate-path": "^2.0.0"
       }
     },
+    "firebase": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/firebase/-/firebase-9.3.0.tgz",
+      "integrity": "sha512-JGrWWmMjoDutwK8OGEE2nJoteQAR8r0LPqZnz6GHOtKMlVaNEbvy4eoIMuwnQFaap/lYdAVfWkRJghuSGdCrnQ==",
+      "requires": {
+        "@firebase/analytics": "0.7.3",
+        "@firebase/analytics-compat": "0.1.4",
+        "@firebase/app": "0.7.6",
+        "@firebase/app-check": "0.5.0",
+        "@firebase/app-check-compat": "0.2.0",
+        "@firebase/app-compat": "0.1.7",
+        "@firebase/app-types": "0.7.0",
+        "@firebase/auth": "0.19.1",
+        "@firebase/auth-compat": "0.2.1",
+        "@firebase/database": "0.12.3",
+        "@firebase/database-compat": "0.1.3",
+        "@firebase/firestore": "3.2.1",
+        "@firebase/firestore-compat": "0.1.6",
+        "@firebase/functions": "0.7.4",
+        "@firebase/functions-compat": "0.1.5",
+        "@firebase/installations": "0.5.3",
+        "@firebase/messaging": "0.9.3",
+        "@firebase/messaging-compat": "0.1.3",
+        "@firebase/performance": "0.5.3",
+        "@firebase/performance-compat": "0.1.3",
+        "@firebase/polyfill": "0.3.36",
+        "@firebase/remote-config": "0.3.2",
+        "@firebase/remote-config-compat": "0.1.3",
+        "@firebase/storage": "0.8.5",
+        "@firebase/storage-compat": "0.1.5",
+        "@firebase/util": "1.4.1"
+      }
+    },
     "flatted": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
@@ -10281,8 +10970,7 @@
     "http-parser-js": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
-      "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==",
-      "dev": true
+      "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="
     },
     "http-proxy": {
       "version": "1.18.1",
@@ -10496,6 +11184,11 @@
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
       "dev": true
     },
+    "idb": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/idb/-/idb-3.0.2.tgz",
+      "integrity": "sha512-+FLa/0sTXqyux0o6C+i2lOR0VoS60LU/jzUo5xjfY6+7sEEgy4Gz1O7yFBXvjd7N0NyIGWIRg8DcQSLEG+VSPw=="
+    },
     "ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -13971,7 +14664,6 @@
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz",
       "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
-      "dev": true,
       "requires": {
         "lie": "~3.3.0",
         "pako": "~1.0.2",
@@ -13983,7 +14675,6 @@
           "version": "3.3.0",
           "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
           "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
-          "dev": true,
           "requires": {
             "immediate": "~3.0.5"
           }
@@ -13991,14 +14682,12 @@
         "pako": {
           "version": "1.0.11",
           "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-          "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-          "dev": true
+          "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
         },
         "readable-stream": {
           "version": "2.3.7",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
           "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -14012,14 +14701,12 @@
         "safe-buffer": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
         },
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -14640,6 +15327,11 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
+    "lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY="
+    },
     "lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
@@ -14751,6 +15443,11 @@
         "@sinonjs/commons": "^1.7.0"
       }
     },
+    "long": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
+      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+    },
     "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -17847,6 +18544,11 @@
       "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
       "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
     },
+    "promise-polyfill": {
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.1.3.tgz",
+      "integrity": "sha512-MG5r82wBzh7pSKDRa9y+vllNHz3e3d4CNj1PQE4BQYxLme0gKYYBm9YENq+UkEikyZ0XbiGWxYlVw3Rl9O/U8g=="
+    },
     "promise-retry": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
@@ -17887,6 +18589,33 @@
         "string.prototype.codepointat": "^0.2.0"
       }
     },
+    "protobufjs": {
+      "version": "6.11.2",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz",
+      "integrity": "sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==",
+      "requires": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.4",
+        "@protobufjs/eventemitter": "^1.1.0",
+        "@protobufjs/fetch": "^1.1.0",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/inquire": "^1.1.0",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.0",
+        "@types/long": "^4.0.1",
+        "@types/node": ">=13.7.0",
+        "long": "^4.0.0"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "16.11.6",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz",
+          "integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="
+        }
+      }
+    },
     "protractor": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/protractor/-/protractor-7.0.0.tgz",
@@ -19545,8 +20274,7 @@
     "set-immediate-shim": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
     },
     "set-value": {
       "version": "2.0.1",
@@ -19721,28 +20449,6 @@
         }
       }
     },
-    "simple-plist": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.3.0.tgz",
-      "integrity": "sha512-uYWpeGFtZtVt2NhG4AHgpwx323zxD85x42heMJBan1qAiqqozIlaGrwrEt6kRjXWRWIXsuV1VLCvVmZan2B5dg==",
-      "dev": true,
-      "requires": {
-        "bplist-creator": "0.1.0",
-        "bplist-parser": "0.3.0",
-        "plist": "^3.0.4"
-      },
-      "dependencies": {
-        "bplist-parser": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.0.tgz",
-          "integrity": "sha512-zgmaRvT6AN1JpPPV+S0a1/FAtoxSreYDccZGIqEMSvZl9DMe70mJ7MFzpxa1X+gHVdkToE2haRUHHMiW1OdejA==",
-          "dev": true,
-          "requires": {
-            "big-integer": "1.6.x"
-          }
-        }
-      }
-    },
     "simple-swizzle": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
@@ -20318,12 +21024,6 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
     },
-    "stream-buffers": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
-      "integrity": "sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ=",
-      "dev": true
-    },
     "stream-throttle": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz",
@@ -23405,7 +24105,6 @@
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
       "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "dev": true,
       "requires": {
         "http-parser-js": ">=0.5.1",
         "safe-buffer": ">=5.1.0",
@@ -23415,8 +24114,7 @@
     "websocket-extensions": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-      "dev": true
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
     },
     "whatwg-encoding": {
       "version": "1.0.5",
@@ -23438,6 +24136,11 @@
         }
       }
     },
+    "whatwg-fetch": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz",
+      "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="
+    },
     "whatwg-mimetype": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
@@ -23702,46 +24405,11 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
       "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="
     },
-    "xcode": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/xcode/-/xcode-3.0.1.tgz",
-      "integrity": "sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==",
-      "dev": true,
-      "requires": {
-        "simple-plist": "^1.1.0",
-        "uuid": "^7.0.3"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
-          "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
-          "dev": true
-        }
-      }
-    },
     "xdg-basedir": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
       "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="
     },
-    "xml-js": {
-      "version": "1.6.11",
-      "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
-      "integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==",
-      "dev": true,
-      "requires": {
-        "sax": "^1.2.4"
-      },
-      "dependencies": {
-        "sax": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-          "dev": true
-        }
-      }
-    },
     "xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
diff --git a/package.json b/package.json
index fef379a07..8bc0fca72 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,13 @@
     "@angular/platform-browser": "~12.1.2",
     "@angular/platform-browser-dynamic": "~12.1.2",
     "@angular/router": "~12.1.2",
-    "@capacitor/android": "3.3.0",
+    "@capacitor/android": "^3.3.0",
+    "@capacitor/app": "^1.0.5",
     "@capacitor/core": "^3.3.0",
+    "@capacitor/haptics": "^1.1.2",
+    "@capacitor/keyboard": "^1.1.2",
+    "@capacitor/push-notifications": "^1.0.7",
+    "@capacitor/status-bar": "^1.0.5",
     "@fortawesome/angular-fontawesome": "^0.9.0",
     "@fortawesome/fontawesome-free": "^5.15.3",
     "@fortawesome/fontawesome-svg-core": "^1.2.35",
@@ -48,7 +53,6 @@
     "@ionic-native/file": "^5.36.0",
     "@ionic-native/file-path": "^5.30.0",
     "@ionic-native/fingerprint-aio": "^4.20.0",
-    "@ionic-native/firebase-x": "^5.36.0",
     "@ionic-native/http": "^5.31.1",
     "@ionic-native/image-picker": "^5.36.0",
     "@ionic-native/in-app-browser": "^5.28.0",
@@ -94,6 +98,7 @@
     "dotenv": "^10.0.0",
     "duration": "^0.2.2",
     "faker": "^5.5.3",
+    "firebase": "^9.3.0",
     "global": "^4.4.0",
     "hammerjs": "^2.0.8",
     "http-server": "^0.12.3",
@@ -103,7 +108,7 @@
     "ionic2-calendar": "^0.6.6",
     "ionicons": "^5.5.3",
     "jest-puppeteer": "^5.0.4",
-    "jetifier": "^1.6.6",
+    "jetifier": "^1.6.8",
     "lite-server": "^2.6.1",
     "moment": "^2.29.1",
     "ng2-pdf-viewer": "^7.0.1",
@@ -146,10 +151,8 @@
     "cordova-plugin-compat": "^1.2.0",
     "cordova-plugin-device": "^2.0.2",
     "cordova-plugin-dialogs": "^2.0.2",
-    "cordova-plugin-fcm-with-dependecy-updated": "^7.2.0",
     "cordova-plugin-file": "^6.0.2",
     "cordova-plugin-fingerprint-aio": "^4.0.2",
-    "cordova-plugin-firebasex": "^13.0.1",
     "cordova-plugin-globalization": "^1.11.0",
     "cordova-plugin-inappbrowser": "^4.0.0",
     "cordova-plugin-ionic-keyboard": "^2.2.0",
@@ -238,4 +241,4 @@
     "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git"
   },
   "license": "ISC"
-}
\ No newline at end of file
+}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 22ca48f4a..4a8f6e002 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -65,8 +65,8 @@ import { Media } from '@ionic-native/media/ngx';
 import { StreamingMedia } from '@ionic-native/streaming-media/ngx';
 import { PhotoViewer } from '@ionic-native/photo-viewer/ngx';
 
-import { FCM } from '@ionic-native/fcm/ngx';
-import { FirebaseX } from '@ionic-native/firebase-x/ngx';
+/* import { FCM } from '@ionic-native/fcm/ngx';
+import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
 //import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
 
 @NgModule({
@@ -115,8 +115,8 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx';
     //File,
     WebView,
     FilePath,
-    FCM,
-    FirebaseX,
+   /*  FCM,
+    FirebaseX, */
     WebsocketService,
     ChatService,
     ScreenOrientation,
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index c768fda55..89d15ef7e 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -3,7 +3,7 @@
 import { Component, OnInit, NgZone } from '@angular/core';
 import { Event } from '../models/event.model';
 import { NotificationsService } from '../services/notifications.service';
-import { WebNotificationsService } from '../services/webnotifications.service';
+/*import { WebNotificationsService } from '../services/webnotifications.service'; */
 import { AlertController, Platform } from '@ionic/angular';
 import { Router, ActivatedRoute } from '@angular/router';
 import { ToDayEventStorage } from '../store/to-day-event-storage.service';
@@ -14,7 +14,7 @@ import { InativityService } from '../services/inativity.service';
 import { SessionStore } from '../store/session.service';
 import { StorageService } from '../services/storage.service';
 import { File } from '@ionic-native/file/ngx';
-import { WebNotificationPopupService } from '../services/notification/web-notification-popup.service';
+/* import { WebNotificationPopupService } from '../services/notification/web-notification-popup.service'; */
 import { DocumentCounterService } from '../services/worker/document-counter.service';
 import { PermissionService } from '../services/worker/permission.service';
 import { Network } from '@ionic-native/network/ngx';
@@ -24,7 +24,10 @@ import { Storage } from '@ionic/storage';
 import { EventsService } from 'src/app/services/events.service';
 import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> migraCapacitor
 @Component({
   selector: 'app-home',
   templateUrl: './home.page.html',
@@ -73,20 +76,24 @@ export class HomePage implements OnInit {
     private notificationsService: NotificationsService,
     private platform: Platform,
     private activeroute: ActivatedRoute,
-    private webnotification: WebNotificationsService,
+    /* private webnotification: WebNotificationsService, */
     public p: PermissionService,
     public documentCounterService: DocumentCounterService,
     private despachoRule: DespachoService,
     private inativityService: InativityService,
     private storageService: StorageService,
-    private webNotificationPopupService: WebNotificationPopupService,
+    /* private webNotificationPopupService: WebNotificationPopupService, */
     private backgroundservice: BackgroundService,
     private offlinemanager: OfflineManagerService,
     private storage: Storage,
     private eventservice: EventsService,
+<<<<<<< HEAD
     private screenOrientation: ScreenOrientation) {
+=======
+    private screenOrientation: ScreenOrientation,) {
+>>>>>>> migraCapacitor
 
-    this.webNotificationPopupService.askNotificationPermission()
+    /* this.webNotificationPopupService.askNotificationPermission() */
 
     this.router.events.subscribe((val) => {
       document.querySelectorAll('ion-modal').forEach((e: any) => e.remove())
@@ -114,17 +121,24 @@ export class HomePage implements OnInit {
 
   ngOnInit() {
 
+<<<<<<< HEAD
     this.notificationsService.onReceviNotification();
+=======
+    this.notificationsService.onReciveForeground();
+    this.notificationsService.onReciveBackground();
+>>>>>>> migraCapacitor
 
     window.addEventListener('online', () => {
       console.log('Became online')
       this.backgroundservice.online()
       if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+<<<<<<< HEAD
         this.webnotification.webconnection();
+=======
+
+>>>>>>> migraCapacitor
       } else {
-        this.notificationsService.onReceviNotification();
-        //this.mobilefirstConnect();
-        //this.notificationsService.onReceviNotification();
+        /* this.notificationsService.onReceviNotification(); */
         this.offlinemanager.synchnize()
       }
     });
@@ -146,12 +160,12 @@ export class HomePage implements OnInit {
 
   updateList() {
 
-    this.notificationsService.registerCallback(
-      'despachos',
-      () => {
-        this.despachoRule.getList({ updateStore: true })
-      }
-    )
+    /*  this.notificationsService.registerCallback(
+       'despachos',
+       () => {
+         this.despachoRule.getList({ updateStore: true })
+       }
+     ) */
 
     document.addEventListener('pause', function () {
       // console.log('App going to background');
diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html
index ff5276b6e..5069a3183 100644
--- a/src/app/modals/profile/profile.page.html
+++ b/src/app/modals/profile/profile.page.html
@@ -56,8 +56,8 @@
               </div>
               <div class="approve-event-detail">
                 <p *ngIf = "item.Service == 'agenda'">{{item.Location}}</p>
-                <h3 id="profile-title">{{item.alert}}</h3>
-                <p *ngIf = "item.Service != 'agenda'">{{item.desc}}</p>
+                <h3 id="profile-title">{{item.title}}</h3>
+                <p *ngIf = "item.Service != 'agenda'">{{item.body}}</p>
               </div>
               <!-- <div class="notification-label-MD-official" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'official' && item.Role == '100000011'"   ></div>
               <div class="notification-label-MD-pessoal" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'pessoal' && item.Role == '100000011'"   ></div>
diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts
index 54e8f0905..a95593612 100644
--- a/src/app/modals/profile/profile.page.ts
+++ b/src/app/modals/profile/profile.page.ts
@@ -5,9 +5,8 @@ import { LoginUserRespose } from 'src/app/models/user.model';
 import { AuthService } from 'src/app/services/auth.service';
 import { LocalstoreService } from 'src/app/store/localstore.service';
 import { EditProfilePage } from './edit-profile/edit-profile.page';
-import { JsonStore } from '../../services/jsonStore.service';
 import { StorageService } from '../../services/storage.service';
-import { NotificationsService } from '../../services/notifications.service';
+/* import { NotificationsService } from '../../services/notifications.service'; */
 import { SessionStore } from 'src/app/store/session.service';
 import { EventTrigger } from '../../services/eventTrigger.service';
 import { ThemeService } from 'src/app/services/theme.service'
@@ -37,12 +36,11 @@ export class ProfilePage implements OnInit {
     private animationController: AnimationController,
     private router: Router,
     private localstoreService: LocalstoreService,
-    private jsonstore: JsonStore,
     private storageservice: StorageService,
     private zone: NgZone,
-    private notificationservice: NotificationsService,
+    /* private notificationservice: NotificationsService, */
     private platform: Platform,
-    private notificationsService: NotificationsService,
+    /* private notificationsService: NotificationsService, */
     private eventtrigger: EventTrigger,
     public ThemeService: ThemeService
   ) {
@@ -61,14 +59,14 @@ export class ProfilePage implements OnInit {
       this.getNotificationData();
     }
 
-    this.notificationsService.registerCallback(
+   /*  this.notificationsService.registerCallback(
       'any',
       () => {
         setTimeout(()=>{
           this.getNotificationData();
         }, 100)
       }
-    )
+    ) */
 
   }
 
@@ -85,33 +83,40 @@ export class ProfilePage implements OnInit {
     this.storageservice.get("Notifications").then((value) => {
       console.log("Init get store", value)
 
-      /* var data = JSON.parse(value); */
-      console.log("Init store parse", value)
-      if(typeof(value) == 'string') {
-        value = JSON.parse(value)
-        console.log("CSDfdvdf",value)
-      }
-
       this.DataArray = []
       value.forEach((element,i) => {
         console.log("ARaaAA", element)
-        let notificationObject;
-        if(element.payload){
+        let notificationObject = {
+          index: i,
+          title: element.title,
+          Service: element.data.Service,
+          Object: element.data.Object,
+          IdObject: element.data.IdObject,
+          FolderId: element.data.FolderId,
+          body: element.body,
+          dateInit: this.getFormatedTime(element.data.dateInit),
+          dateEnd: this.getFormatedTime(element.data.dateEnd),
+          Location: element.data.Location,
+          TypeAgenda: element.data.TypeAgenda,
+          Role: element.data.Role,
+          Status: element.data.Status
+        }
+        /* if(element.payload){
           var payload = JSON.parse(element.payload)
           notificationObject = {
-            index: i,
-            alert: element.alert,
+            //index: i,
+            //alert: element.alert,
             Service: payload.Service,
             Object: payload.Object,
             IdObject: payload.IdObject,
-            FolderId: payload.FolderId,
-            desc: payload.desc,
-            dateInit: this.getFormatedTime(payload.dateInit),
-            dateEnd: this.getFormatedTime(payload.dateEnd),
-            Location: payload.Location,
-            TypeAgenda: payload.TypeAgenda,
-            Role: payload.Role,
-            Status: payload.Status
+            //FolderId: payload.FolderId,
+            //desc: payload.desc,
+            //dateInit: this.getFormatedTime(payload.dateInit),
+            //dateEnd: this.getFormatedTime(payload.dateEnd),
+            //Location: payload.Location,
+            //TypeAgenda: payload.TypeAgenda,
+            //Role: payload.Role,
+            //Status: payload.Status
           }
         } else {
           notificationObject = {
@@ -128,9 +133,9 @@ export class ProfilePage implements OnInit {
             TypeAgenda: element.TypeAgenda,
             Role: element.Role,
             Status: element.Status
-          }
-        }
-
+          } 
+        }*/
+        
 
         this.DataArray.push(notificationObject)
       });
@@ -200,7 +205,7 @@ export class ProfilePage implements OnInit {
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', IdObject, 'gabinete-digital']));
     }
 
-    this.notificationservice.tempClearArray();
+    //this.notificationservice.tempClearArray();
     this.deleteNotification(index);
     this.eventtrigger.publishSomeData({
       notification: "deleted"
diff --git a/src/app/models/token.model.ts b/src/app/models/token.model.ts
index 062fe5f67..d4d4046d2 100644
--- a/src/app/models/token.model.ts
+++ b/src/app/models/token.model.ts
@@ -1,4 +1,4 @@
-export class Token {
+export class Tokenn {
     UserId: number;
     TokenId: string;
     Status: number;
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 296cd4de2..9056c7ef8 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -26,7 +26,7 @@ import { NavigationStart, NavigationEnd, Router } from '@angular/router';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { environment } from 'src/environments/environment';
-import { NotificationsService } from 'src/app/services/notifications.service';
+//import { NotificationsService } from 'src/app/services/notifications.service';
 import { TimeService } from 'src/app/services/functions/time.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { DataService } from 'src/app/services/data.service';
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 5648ca0f7..bae0452a5 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -121,12 +121,6 @@ export class EventsPage implements OnInit {
 
   ngOnInit() {
 
-      try {
-        this.sqliteservice.databaseConn();
-      } catch (error) {
-        console.log("Error creating local database: ", error)
-      }
-
     this.segment = "Combinada";
     this.profile = "mdgpr";
 
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index d74544854..9ae555f51 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -19,7 +19,7 @@ import { WaitForDomService } from 'src/app/services/dom/wait-for-dom.service';
 import { TotalDocumentStore } from 'src/app/store/total-document.service';
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
-import { NotificationsService } from 'src/app/services/notifications.service';
+//import { NotificationsService } from 'src/app/services/notifications.service';
 import { DespachoService } from 'src/app/Rules/despacho.service';
 import { ChangeProfileService } from 'src/app/services/change-profile.service';
 import { PermissionService } from 'src/app/services/worker/permission.service';
@@ -124,7 +124,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     authService: AuthService,
     public p: PermissionService,
     public waitForDomService: WaitForDomService,
-    private notificationsService: NotificationsService,
+    //private notificationsService: NotificationsService,
     private despachoRule: DespachoService,
     private sqliteservice: SqliteService,
     private platform: Platform,
diff --git a/src/app/pages/inactivity/inactivity.page.ts b/src/app/pages/inactivity/inactivity.page.ts
index 20b3a67c4..1b2d1efae 100644
--- a/src/app/pages/inactivity/inactivity.page.ts
+++ b/src/app/pages/inactivity/inactivity.page.ts
@@ -141,7 +141,9 @@ export class InactivityPage implements OnInit {
   }
 
   getToken() {
-    //this.notificatinsservice.getAndpostToken(this.username);
+    this.notificatinsservice.requestPermissions();
+    this.notificatinsservice.registrationError();
+    this.notificatinsservice.getAndpostToken(this.username);
   }
 
   setCode(code: string) {
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 411e03c07..32f026712 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -74,6 +74,8 @@ export class LoginPage implements OnInit {
   }
 
   getToken() {
+    this.notificatinsservice.requestPermissions();
+    this.notificatinsservice.registrationError();
     this.notificatinsservice.getAndpostToken(this.username);
   }
 
diff --git a/src/app/services/jsonStore.service.spec.ts b/src/app/services/jsonStore.service.spec.ts
deleted file mode 100644
index ed030373c..000000000
--- a/src/app/services/jsonStore.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { JsonStore } from './jsonStore.service';
-
-describe('JsonStore', () => {
-  let service: JsonStore;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(JsonStore);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts
index 6e68db071..31bbbeb40 100644
--- a/src/app/services/notifications.service.ts
+++ b/src/app/services/notifications.service.ts
@@ -6,18 +6,15 @@ import { HttpClient } from '@angular/common/http';
 import { environment } from 'src/environments/environment';
 import { StorageService } from 'src/app/services/storage.service';
 import { AuthConnstants } from 'src/app/config/auth-constants';
-import { Token } from '../models/token.model';
+import { Tokenn } from '../models/token.model';
 import { ModalController, AlertController, AnimationController, Platform } from '@ionic/angular';
 import { NavigationExtras, Router } from '@angular/router';
 import { ToastService } from '../services/toast.service';
-import { JsonStore } from './jsonStore.service';
 import { BackgroundService } from './background.service';
 import { v4 as uuidv4 } from 'uuid';
 import { EventTrigger } from '../services/eventTrigger.service';
 import { SessionStore } from '../store/session.service';
-
-import { FCM } from '@ionic-native/fcm/ngx';
-//import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
+import { ActionPerformed, PushNotificationSchema, PushNotifications, Token, } from '@capacitor/push-notifications';
 
 @Injectable({
   providedIn: 'root'
@@ -26,7 +23,7 @@ export class NotificationsService {
 
   adding: "intervenient" | "CC" = "intervenient";
   folderId: string;
-  DataArray: Array<String> = [];
+  DataArray = new Array();
 
   callbacks: {
     type: string,
@@ -45,9 +42,9 @@ export class NotificationsService {
     private toastService: ToastService,
     private zone: NgZone,
     private activeroute: ActivatedRoute,
-    private jsonstore: JsonStore,
     private eventtrigger: EventTrigger,
-    private backgroundservice: BackgroundService) {
+    private backgroundservice: BackgroundService,
+    /* private fcm: FCM */) {
 
       this.storageService.get("Notifications").then((value) => {
 
@@ -85,23 +82,128 @@ export class NotificationsService {
   getTokenByUserIdAndId(user, userID) {
     const geturl = environment.apiURL + 'notifications/user/' + userID;
 
-    return this.http.get<Token[]>(`${geturl}`);
+    return this.http.get<Tokenn[]>(`${geturl}`);
   }
 
+  requestPermissions() {
+    PushNotifications.requestPermissions().then(result => {
+      if (result.receive === 'granted') {
+        // Register with Apple / Google to receive push via APNS/FCM
+        PushNotifications.register();
+      } else {
+        // Show some error
+      }
+    });
+  }
+
+  getAndpostToken(username) {
+    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      console.log('Notifications not supported')
+    } else {
+      const geturl = environment.apiURL + 'notifications/token';
+      PushNotifications.addListener('registration',
+        (token: Token) => {
+          console.log('token: ', token.value)
+          this.storageService.store(username, token.value);
+          this.storageService.get(username).then(value => {
+            console.log('STORAGE TOKEN', value)
+            this.storageService.get(AuthConnstants.USER).then(res => {
+              console.log('USERID', res);
+              const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
+              const body = {
+                UserId: res.UserId,
+                TokenId: token.value,
+                Status: 1,
+                Service: 1
+              };
+
+              this.http.post<Tokenn>(`${geturl}`, body, { headers }).subscribe(data => {
+                console.log('TOKEN USER MIDLE', data);
+              }, (error) => {
+                console.log('Post token to backend', error)
+              })
+            });
+
+          });
+        }
+      );
+    }
+
+  }
+
+  registrationError() {
+    PushNotifications.addListener('registrationError',
+      (error: any) => {
+        console.log('Error on registration: ' + JSON.stringify(error));
+      }
+    );
+  }
+
+  onReciveForeground() {
+    PushNotifications.addListener('pushNotificationReceived',
+      (notification: PushNotificationSchema) => {
+        console.log('Push received: ' + JSON.stringify(notification));
+        this.DataArray.push(notification)
+        console.log("On ReceiveNotification", this.DataArray)
+        this.storageService.store("Notifications", this.DataArray)
+        this.eventtrigger.publishSomeData({
+          notification: "recive"
+        })
+      }
+    );
+  }
+
+  onReciveBackground() {
+    PushNotifications.addListener('pushNotificationActionPerformed',
+      (notification: ActionPerformed) => {
+        console.log('Push action performed: ' + JSON.stringify(notification));
+        this.notificatinsRoutes(notification)
+      }
+    );
+  }
+
+
+
+  /*  
+  
+    async onReceviNotification() {
+      this.fcm.onNotification().subscribe(data => {
+        if (data.click_action) {
+          console.log("Received in background: ", data);
+  
+          this.notificatinsRoutes(data)
+  
+        } else {
+          console.log("Received in foreground: ", data);
+  
+          console.log(data.Service)
+          console.log(data.Object)
+          console.log(data.IdObject)
+  
+          this.DataArray.push(data)
+          console.log("On ReceiveNotification", this.DataArray)
+          this.storageService.store("Notifications", this.DataArray)
+  
+  
+        };
+      });
+    } */
+
+
   /////////////////////////////////////////////////////
 
   /* getTokenByUserIdAndId(user, userID) {
     const geturl = environment.apiURL + 'notifications/user/' + userID;
-
+  
     return this.http.get<Token[]>(`${geturl}`);
   }
- */
+  */
   /*   getAndpostToken(username) {
-  
+   
       if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
         //console.log('Notifications not supported')
       } else {
-  
+   
         const geturl = environment.apiURL + 'notifications/token';
         if(window['WLAuthorizationManager']) {
           if(window['WLAuthorizationManager'].obtainAccessToken) {
@@ -153,17 +255,17 @@ export class NotificationsService {
             );
           }
         }
-  
+   
       }
-  
+   
     } */
 
   tempClearArray() {
-    this.DataArray = [];
+    this.DataArray = new Array;
   }
 
   /*   async onReceviNotification() {
-  
+   
       if(window['WLAuthorizationManager']) {
         if(window['WLAuthorizationManager'].obtainAccessToken) {
           window['WLAuthorizationManager'].obtainAccessToken("push.mobileclient").then(
@@ -178,33 +280,30 @@ export class NotificationsService {
                   console.log("Push notification failure intialized: " + failureResponse);
                 }
               );
-
-              window['MFPPush'].registerDevice(null, async (successResponse) => {
-                console.log("Successfully registered: " + JSON.stringify(successResponse));
-                console.log('token: ', successResponse.deviceId)
-                await this.storageService.store(username, successResponse.deviceId).then((tokennoti) => {
-                  console.log('token store',tokennoti)
-                });
-                await this.storageService.get(username).then(value => {
-                  console.log('STORAGE TOKEN', value)
-                  this.storageService.get(AuthConnstants.USER).then(res => {
-                    console.log('USERID', res);
-                    const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
-                    const body = {
-                      UserId: res.UserId,
-                      TokenId: successResponse.deviceId,
-                      Status: 1,
-                      Service: 1
-                    };
-                    this.http.post<Token>(`${geturl}`, body, { headers }).subscribe(data => {
-                      console.log('TOKEN USER MIDLE', data);
-                    })
-                  });
-
-                });
-              },
-                function (failureResponse) {
-                  console.log("Successfully failue: " + JSON.stringify(failureResponse));
+              var notificationReceived = (message) => {
+                //this.jsonstore.createCollection('Notifications',message);
+                this.DataArray.push(message)
+                console.log("On ReceiveNotification", this.DataArray)
+                this.storageService.store("Notifications",this.DataArray)
+                
+                console.log(message);
+                this.eventtrigger.publishSomeData({
+                  notification: "recive"
+                })
+                var data = JSON.parse(message.payload);
+   
+                //synchro.$send(data)
+                
+                console.log('data.Service', data.Service); // module
+                console.log('data.IdObject', data.IdObject); // Object id
+                console.log('data.Object', data.Object); // details
+      
+                if(message.actionName){
+                  this.notificatinsRoutes(data);
+                } else {
+                 /*  this.toastService.notificationMessage(message.alert,this.notificatinsRoutes, data); 
+                 //this.notificatinsRoutes(data);
+                 console.log(data)
                 }
                 
                 this.callbacks.forEach( e=> {
@@ -212,7 +311,7 @@ export class NotificationsService {
                     e.funx()
                   }
                 })
-  
+   
               }
             }, (error) => {
               console.log('Push notification recived: failure ' + error.responseText);
@@ -221,54 +320,54 @@ export class NotificationsService {
           );
         }
       }
-  
-  
+   
+   
     } */
 
-  notificatinsRoutes = (data) => {
-    if (data.Service === "agenda") {
-      this.zone.run(() => this.router.navigate(['/home/agenda', data.IdObject, 'agenda']));
+  notificatinsRoutes = (notification) => {
+    if (notification.data.Service === "agenda") {
+      this.zone.run(() => this.router.navigate(['/home/agenda', notification.data.IdObject, 'agenda']));
     }
-    else if (data.Service === "gabinete-digital" && data.Object === "expediente") {
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', data.IdObject, 'gabinete-digital']));
+    else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "expediente") {
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', notification.data.IdObject, 'gabinete-digital']));
     }
-    else if (data.Service === "agenda" && data.Object === "event-list") {
-      this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', data.IdObject, 'agenda']));
-    } else if (data.Service === "gabinete-digital" && data.Object === "despachos") {
+    else if (notification.data.Service === "agenda" && notification.data.Object === "event-list") {
+      this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', notification.data.IdObject, 'agenda']));
+    } else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "despachos") {
 
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', data.IdObject, 'gabinete-digital'], { replaceUrl: true }));
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', notification.data.IdObject, 'gabinete-digital'], { replaceUrl: true }));
     }
-    else if (data.Service === "gabinete-digital" && data.Object === "parecer") {
+    else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "parecer") {
 
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', data.IdObject, 'gabinete-digital']));
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.data.IdObject, 'gabinete-digital']));
     }
-    else if (data.Service === "gabinete-digital" && data.Object === "deferimento") {
+    else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "deferimento") {
 
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', data.IdObject, 'gabinete-digital']));
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.data.IdObject, 'gabinete-digital']));
     }
-    else if (data.Service === "gabinete-digital" && data.Object === "despachos-pr") {
+    else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "despachos-pr") {
 
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos-pr', data.IdObject, 'gabinete-digital']));
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos-pr', notification.data.IdObject, 'gabinete-digital']));
     }
-    else if (data.Service === "accoes" && data.Object === "accao") {
-      this.zone.run(() => this.router.navigate(['/home/publications', data.IdObject]));
+    else if (notification.data.Service === "accoes" && notification.data.Object === "accao") {
+      this.zone.run(() => this.router.navigate(['/home/publications', notification.data.IdObject]));
     }
-    else if (data.Service === "accoes" && data.Object === "publicacao") {
-      this.zone.run(() => this.router.navigate(['/home/publications/view-publications', data.FolderId, data.IdObject]));
+    else if (notification.data.Service === "accoes" && notification.data.Object === "publicacao") {
+      this.zone.run(() => this.router.navigate(['/home/publications/view-publications', notification.data.FolderId, notification.data.IdObject]));
     }
-    else if (data.Service === "gabinete-digital" && data.Object === "diplomas") {
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', data.IdObject, 'gabinete-digital']));
+    else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "diplomas") {
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', notification.data.IdObject, 'gabinete-digital']));
     }
-    else if (data.Service === "gabinete-digital" && data.Object === "diplomas-assinar") {
+    else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "diplomas-assinar") {
       let navigationExtras: NavigationExtras = {
         queryParams: {
-          "serialNumber": data.IdObject,
+          "serialNumber": notification.data.IdObject,
         }
       };
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras));
     }
-    else if (data.Service === "gabinete-digital" && data.Object === "expedientes-pr") {
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', data.IdObject, 'gabinete-digital']));
+    else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "expedientes-pr") {
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', notification.data.IdObject, 'gabinete-digital']));
     }
   }
 
diff --git a/src/app/services/webnotifications.service.ts b/src/app/services/webnotifications.service.ts
index 96c30cd34..db0818093 100644
--- a/src/app/services/webnotifications.service.ts
+++ b/src/app/services/webnotifications.service.ts
@@ -3,7 +3,7 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { environment } from 'src/environments/environment';
 import { StorageService } from 'src/app/services/storage.service';
 import { AuthConnstants } from 'src/app/config/auth-constants';
-import { Token } from '../models/token.model';
+import { Tokenn } from '../models/token.model';
 import { ModalController, AlertController, AnimationController, Platform } from '@ionic/angular';
 import { NavigationExtras, Router } from '@angular/router';
 import { ToastService } from './toast.service';
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index de913d563..f5e2bc12c 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -6,7 +6,7 @@ import { LoginUserRespose } from 'src/app/models/user.model';
 import { ProfilePage } from 'src/app/modals/profile/profile.page';
 import { StorageService } from '../../services/storage.service';
 import { SessionStore } from 'src/app/store/session.service';
-import { NotificationsService } from '../../services/notifications.service';
+//import { NotificationsService } from '../../services/notifications.service';
 import { environment } from 'src/environments/environment';
 import { EventTrigger } from '../../services/eventTrigger.service';
 import { ThemeService } from '../../services/theme.service';
@@ -35,7 +35,7 @@ export class HeaderPage implements OnInit {
     private animationController: AnimationController,
     private storageservice: StorageService,
     private platform: Platform,
-    private notificationsService: NotificationsService,
+    //private notificationsService: NotificationsService,
     private eventrigger: EventTrigger,
     public ThemeService: ThemeService
   ) {
@@ -67,7 +67,7 @@ export class HeaderPage implements OnInit {
 
   }
   
-  UpdateNotificationCount() {
+ /*  UpdateNotificationCount() {
     this.notificationsService.registerCallback(
       'any',
       () => {
@@ -76,7 +76,7 @@ export class HeaderPage implements OnInit {
         }, 100)
       }
     )
-  }
+  } */
 
    notificationLengthData() {
     this.storageservice.get("Notifications").then((value) => {
diff --git a/src/assets/js/index.js b/src/assets/js/index.js
index 7d2a23acd..40ff5e409 100644
--- a/src/assets/js/index.js
+++ b/src/assets/js/index.js
@@ -1,42 +1,28 @@
-function wlCommonInit() {
-  
-  if(window['WLAuthorizationManager']) {
-    if(window['WLAuthorizationManager'].obtainAccessToken) {
-      window['WLAuthorizationManager'].obtainAccessToken("").then(
-        (token) => {
-          console.log('MobileFirst Server connect: Success ' + token);
-    
-          var resourceRequest = new WLResourceRequest("/adapters/javaAdapter/resource/greet/",
-            WLResourceRequest.GET
-          );
-    
-          resourceRequest.setQueryParameter("name", "world");
-          resourceRequest.send().then(
-            (response) => {
-              // Will display "Hello world" in an alert dialog.
-              console.log("Connect with JavaAdapter Success: " + response.responseText);
-              //this.MFPushNotification();
-            },
-            (error) => {
-              alert("Connect with JavaAdapter Failure: " + JSON.stringify(error));
-            }
-          );
-        }, (error) => {
-          console.log('MobileFirst Server connect: failure ' + error.responseText);
-          console.log(JSON.stringify(error))
-          /* this.zone.run(() => {
-            alert("Bummer...");
-            alert("Failed to connect to MobileFirst Server");
-          }); */
-        }
-      );
-    }
-  }
 
+// Import the functions you need from the SDKs you need
+import { initializeApp } from "https://www.gstatic.com/firebasejs/9.2.0/firebase-app.js";;
+import { getAnalytics } from "https://www.gstatic.com/firebasejs/9.2.0/firebase-analytics.js";
+import { getMessaging, getToken } from "https://www.gstatic.com/firebasejs/9.2.0/firebase-messaging.js";
 
+// TODO: Add SDKs for Firebase products that you want to use
+// https://firebase.google.com/docs/web/setup#available-libraries
 
+// Your web app's Firebase configuration
+// For Firebase JS SDK v7.20.0 and later, measurementId is optional
+const firebaseConfig = {
+  apiKey: "AIzaSyAAdHmTFznCMerdT99nrewJgISRvtxPqoY",
+  authDomain: "gabinete-digital-2020.firebaseapp.com",
+  databaseURL: "https://gabinete-digital-2020.firebaseio.com",
+  projectId: "gabinete-digital-2020",
+  storageBucket: "gabinete-digital-2020.appspot.com",
+  messagingSenderId: "800733765231",
+  appId: "1:800733765231:web:28e7792ab150006513779a",
+  measurementId: "G-8QN4BLZ8XK"
+};
 
+// Initialize Firebase
+const app = initializeApp(firebaseConfig);
+const analytics = getAnalytics(app);
+const messaging = getMessaging(app);
 
-
-
-}
\ No newline at end of file
+getToken({vapidKey: "BEuyzkUKcx4FSs-6GaIz_si2oV5Ut7e5ZEtcrVvr5L_tMVWZtS1NTqdtQkih5QCt2FZKuRUxZIaLm5GaxI6nJEw"});
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index 46a2b372a..2d40cbfe9 100644
--- a/src/index.html
+++ b/src/index.html
@@ -65,6 +65,7 @@
   <link rel="preconnect" href="https://fonts.gstatic.com">
   <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap" rel="stylesheet">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+  <script type="module" src="./assets/js/index.js"></script>
 </head>
 
 <body class='gov'>